This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2532

webcommands: use explicit integer division for Python 3 compat
ClosedPublic

Authored by durin42 on Mar 1 2018, 6:39 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG24897a9d18ac: webcommands: use explicit integer division for Python 3 compat
rHGd40cfe72b79d: webcommands: use explicit integer division for Python 3 compat

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Mar 1 2018, 6:39 PM
yuja accepted this revision.Mar 1 2018, 7:32 PM
This revision is now accepted and ready to land.Mar 1 2018, 7:32 PM
Closed by commit rHGd40cfe72b79d: webcommands: use explicit integer division for Python 3 compat (authored by durin42). · Explain WhyMar 1 2018, 7:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/webcommands.py (8 lines)

Diff 6311

mercurial/hgweb/webcommands.py

try: try:
revcount = int(req.form.get('revcount', [revcount])[0]) revcount = int(req.form.get('revcount', [revcount])[0])
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
lessvars['rev'] = query lessvars['rev'] = query
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2 morevars['revcount'] = revcount * 2
morevars['rev'] = query morevars['rev'] = query
mode, funcarg = getsearchmode(query) mode, funcarg = getsearchmode(query)
if 'forcekw' in req.form: if 'forcekw' in req.form:
try: try:
revcount = int(req.form.get('revcount', [revcount])[0]) revcount = int(req.form.get('revcount', [revcount])[0])
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2 morevars['revcount'] = revcount * 2
count = len(web.repo) count = len(web.repo)
pos = ctx.rev() pos = ctx.rev()
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
changenav = webutil.revnav(web.repo).gen(pos, revcount, count) changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lrange = webutil.linerange(req) lrange = webutil.linerange(req)
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2 morevars['revcount'] = revcount * 2
patch = 'patch' in req.form patch = 'patch' in req.form
if patch: if patch:
lessvars['patch'] = morevars['patch'] = req.form['patch'][0] lessvars['patch'] = morevars['patch'] = req.form['patch'][0]
descend = 'descend' in req.form descend = 'descend' in req.form
if descend: if descend:
try: try:
revcount = int(req.form.get('revcount', [revcount])[0]) revcount = int(req.form.get('revcount', [revcount])[0])
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2 morevars['revcount'] = revcount * 2
graphtop = req.form.get('graphtop', [ctx.hex()])[0] graphtop = req.form.get('graphtop', [ctx.hex()])[0]
graphvars = copy.copy(tmpl.defaults['sessionvars']) graphvars = copy.copy(tmpl.defaults['sessionvars'])
graphvars['graphtop'] = graphtop graphvars['graphtop'] = graphtop
count = len(web.repo) count = len(web.repo)