This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2801

hgweb: don't redundantly pass templater with requestcontext (API)
ClosedPublic

Authored by indygreg on Mar 11 2018, 12:24 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGc68e79dcf21c: hgweb: don't redundantly pass templater with requestcontext (API)
Summary

The requestcontenxt has a `tmpl` attribute to access the
templater. We don't need to pass the templater explicitly when
passing a requestcontext instance.

.. api::

Various helper functions in hgweb.webutil no longer accept a
templater instance. Access the templater through the
``web`` argument instead.

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

indygreg created this revision.Mar 11 2018, 12:24 AM
durin42 accepted this revision.Mar 12 2018, 5:17 PM
This revision is now accepted and ready to land.Mar 12 2018, 5:17 PM
Closed by commit rHGc68e79dcf21c: hgweb: don't redundantly pass templater with requestcontext (API) (authored by indygreg). · Explain WhyMar 12 2018, 5:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6938

mercurial/hgweb/webcommands.py

if pos != -1: if pos != -1:
revs = web.repo.changelog.revs(pos, 0) revs = web.repo.changelog.revs(pos, 0)
curcount = 0 curcount = 0
for rev in revs: for rev in revs:
curcount += 1 curcount += 1
if curcount > revcount + 1: if curcount > revcount + 1:
break break
entry = webutil.changelistentry(web, web.repo[rev], web.tmpl) entry = webutil.changelistentry(web, web.repo[rev])
entry['parity'] = next(parity) entry['parity'] = next(parity)
yield entry yield entry
if shortlog: if shortlog:
revcount = web.maxshortchanges revcount = web.maxshortchanges
else: else:
revcount = web.maxchanges revcount = web.maxchanges
The ``changeset`` template is rendered. Contents of the ``changesettag``, The ``changeset`` template is rendered. Contents of the ``changesettag``,
``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many ``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many
templates related to diffs may all be used to produce the output. templates related to diffs may all be used to produce the output.
""" """
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
return web.sendtemplate( return web.sendtemplate(
'changeset', 'changeset',
**webutil.changesetentry(web, req, web.tmpl, ctx)) **webutil.changesetentry(web, req, ctx))
rev = webcommand('rev')(changeset) rev = webcommand('rev')(changeset)
def decodepath(path): def decodepath(path):
"""Hook for mapping a path in the repository to a path in the """Hook for mapping a path in the repository to a path in the
working copy. working copy.
Extensions (e.g., largefiles) can override this to remap files in Extensions (e.g., largefiles) can override this to remap files in
path = fctx.path() path = fctx.path()
ctx = fctx.changectx() ctx = fctx.changectx()
basectx = ctx.p1() basectx = ctx.p1()
style = web.config('web', 'style') style = web.config('web', 'style')
if 'style' in web.req.qsparams: if 'style' in web.req.qsparams:
style = web.req.qsparams['style'] style = web.req.qsparams['style']
diffs = webutil.diffs(web, web.tmpl, ctx, basectx, [path], style) diffs = webutil.diffs(web, ctx, basectx, [path], style)
if fctx is not None: if fctx is not None:
rename = webutil.renamelink(fctx) rename = webutil.renamelink(fctx)
ctx = fctx ctx = fctx
else: else:
rename = [] rename = []
ctx = ctx ctx = ctx
return web.sendtemplate( return web.sendtemplate(
diffstyle = web.config('web', 'style') diffstyle = web.config('web', 'style')
if 'style' in web.req.qsparams: if 'style' in web.req.qsparams:
diffstyle = web.req.qsparams['style'] diffstyle = web.req.qsparams['style']
def diff(fctx, linerange=None): def diff(fctx, linerange=None):
ctx = fctx.changectx() ctx = fctx.changectx()
basectx = ctx.p1() basectx = ctx.p1()
path = fctx.path() path = fctx.path()
return webutil.diffs(web, web.tmpl, ctx, basectx, [path], diffstyle, return webutil.diffs(web, ctx, basectx, [path], diffstyle,
linerange=linerange, linerange=linerange,
lineidprefix='%s-' % ctx.hex()[:12]) lineidprefix='%s-' % ctx.hex()[:12])
linerange = None linerange = None
if lrange is not None: if lrange is not None:
linerange = webutil.formatlinerange(*lrange) linerange = webutil.formatlinerange(*lrange)
# deactivate numeric nav links when linerange is specified as this # deactivate numeric nav links when linerange is specified as this
# would required a dedicated "revnav" class # would required a dedicated "revnav" class

mercurial/hgweb/webutil.py

'inbranch': nodeinbranch(repo, ctx), 'inbranch': nodeinbranch(repo, ctx),
'branches': nodebranchdict(repo, ctx), 'branches': nodebranchdict(repo, ctx),
'tags': nodetagsdict(repo, node), 'tags': nodetagsdict(repo, node),
'bookmarks': nodebookmarksdict(repo, node), 'bookmarks': nodebookmarksdict(repo, node),
'parent': lambda **x: parents(ctx), 'parent': lambda **x: parents(ctx),
'child': lambda **x: children(ctx), 'child': lambda **x: children(ctx),
} }
def changelistentry(web, ctx, tmpl): def changelistentry(web, ctx):
'''Obtain a dictionary to be used for entries in a changelist. '''Obtain a dictionary to be used for entries in a changelist.
This function is called when producing items for the "entries" list passed This function is called when producing items for the "entries" list passed
to the "shortlog" and "changelog" templates. to the "shortlog" and "changelog" templates.
''' '''
repo = web.repo repo = web.repo
rev = ctx.rev() rev = ctx.rev()
n = ctx.node() n = ctx.node()
showtags = showtag(repo, tmpl, 'changelogtag', n) showtags = showtag(repo, web.tmpl, 'changelogtag', n)
files = listfilediffs(tmpl, ctx.files(), n, web.maxfiles) files = listfilediffs(web.tmpl, ctx.files(), n, web.maxfiles)
entry = commonentry(repo, ctx) entry = commonentry(repo, ctx)
entry.update( entry.update(
allparents=lambda **x: parents(ctx), allparents=lambda **x: parents(ctx),
parent=lambda **x: parents(ctx, rev - 1), parent=lambda **x: parents(ctx, rev - 1),
child=lambda **x: children(ctx, rev + 1), child=lambda **x: children(ctx, rev + 1),
changelogtag=showtags, changelogtag=showtags,
files=files, files=files,
) )
return entry return entry
def symrevorshortnode(req, ctx): def symrevorshortnode(req, ctx):
if 'node' in req.req.qsparams: if 'node' in req.req.qsparams:
return templatefilters.revescape(req.req.qsparams['node']) return templatefilters.revescape(req.req.qsparams['node'])
else: else:
return short(ctx.node()) return short(ctx.node())
def changesetentry(web, req, tmpl, ctx): def changesetentry(web, req, ctx):
'''Obtain a dictionary to be used to render the "changeset" template.''' '''Obtain a dictionary to be used to render the "changeset" template.'''
showtags = showtag(web.repo, tmpl, 'changesettag', ctx.node()) showtags = showtag(web.repo, web.tmpl, 'changesettag', ctx.node())
showbookmarks = showbookmark(web.repo, tmpl, 'changesetbookmark', showbookmarks = showbookmark(web.repo, web.tmpl, 'changesetbookmark',
ctx.node()) ctx.node())
showbranch = nodebranchnodefault(ctx) showbranch = nodebranchnodefault(ctx)
files = [] files = []
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
for blockno, f in enumerate(ctx.files()): for blockno, f in enumerate(ctx.files()):
template = 'filenodelink' if f in ctx else 'filenolink' template = 'filenodelink' if f in ctx else 'filenolink'
files.append(tmpl(template, files.append(web.tmpl(template,
node=ctx.hex(), file=f, blockno=blockno + 1, node=ctx.hex(), file=f, blockno=blockno + 1,
parity=next(parity))) parity=next(parity)))
basectx = basechangectx(web.repo, req) basectx = basechangectx(web.repo, req)
if basectx is None: if basectx is None:
basectx = ctx.p1() basectx = ctx.p1()
style = web.config('web', 'style') style = web.config('web', 'style')
if 'style' in req.req.qsparams: if 'style' in req.req.qsparams:
style = req.req.qsparams['style'] style = req.req.qsparams['style']
diff = diffs(web, tmpl, ctx, basectx, None, style) diff = diffs(web, ctx, basectx, None, style)
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
diffstatsgen = diffstatgen(ctx, basectx) diffstatsgen = diffstatgen(ctx, basectx)
diffstats = diffstat(tmpl, ctx, diffstatsgen, parity) diffstats = diffstat(web.tmpl, ctx, diffstatsgen, parity)
return dict( return dict(
diff=diff, diff=diff,
symrev=symrevorshortnode(req, ctx), symrev=symrevorshortnode(req, ctx),
basenode=basectx.hex(), basenode=basectx.hex(),
changesettag=showtags, changesettag=showtags,
changesetbookmark=showbookmarks, changesetbookmark=showbookmarks,
changesetbranch=showbranch, changesetbranch=showbranch,
files=files, files=files,
diffsummary=lambda **x: diffsummary(diffstatsgen), diffsummary=lambda **x: diffsummary(diffstatsgen),
diffstat=diffstats, diffstat=diffstats,
archives=web.archivelist(ctx.hex()), archives=web.archivelist(ctx.hex()),
**pycompat.strkwargs(commonentry(web.repo, ctx))) **pycompat.strkwargs(commonentry(web.repo, ctx)))
def listfilediffs(tmpl, files, node, max): def listfilediffs(tmpl, files, node, max):
for f in files[:max]: for f in files[:max]:
yield tmpl('filedifflink', node=hex(node), file=f) yield tmpl('filedifflink', node=hex(node), file=f)
if len(files) > max: if len(files) > max:
yield tmpl('fileellipses') yield tmpl('fileellipses')
def diffs(web, tmpl, ctx, basectx, files, style, linerange=None, def diffs(web, ctx, basectx, files, style, linerange=None,
lineidprefix=''): lineidprefix=''):
def prettyprintlines(lines, blockno): def prettyprintlines(lines, blockno):
for lineno, l in enumerate(lines, 1): for lineno, l in enumerate(lines, 1):
difflineno = "%d.%d" % (blockno, lineno) difflineno = "%d.%d" % (blockno, lineno)
if l.startswith('+'): if l.startswith('+'):
ltype = "difflineplus" ltype = "difflineplus"
elif l.startswith('-'): elif l.startswith('-'):
ltype = "difflineminus" ltype = "difflineminus"
elif l.startswith('@'): elif l.startswith('@'):
ltype = "difflineat" ltype = "difflineat"
else: else:
ltype = "diffline" ltype = "diffline"
yield tmpl(ltype, yield web.tmpl(
ltype,
line=l, line=l,
lineno=lineno, lineno=lineno,
lineid=lineidprefix + "l%s" % difflineno, lineid=lineidprefix + "l%s" % difflineno,
linenumber="% 8s" % difflineno) linenumber="% 8s" % difflineno)
repo = web.repo repo = web.repo
if files: if files:
m = match.exact(repo.root, repo.getcwd(), files) m = match.exact(repo.root, repo.getcwd(), files)
else: else:
m = match.always(repo.root, repo.getcwd()) m = match.always(repo.root, repo.getcwd())
diffopts = patch.diffopts(repo.ui, untrusted=True) diffopts = patch.diffopts(repo.ui, untrusted=True)
node1 = basectx.node() node1 = basectx.node()
node2 = ctx.node() node2 = ctx.node()
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
diffhunks = patch.diffhunks(repo, node1, node2, m, opts=diffopts) diffhunks = patch.diffhunks(repo, node1, node2, m, opts=diffopts)
for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1): for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1):
if style != 'raw': if style != 'raw':
header = header[1:] header = header[1:]
lines = [h + '\n' for h in header] lines = [h + '\n' for h in header]
for hunkrange, hunklines in hunks: for hunkrange, hunklines in hunks:
if linerange is not None and hunkrange is not None: if linerange is not None and hunkrange is not None:
s1, l1, s2, l2 = hunkrange s1, l1, s2, l2 = hunkrange
if not mdiff.hunkinrange((s2, l2), linerange): if not mdiff.hunkinrange((s2, l2), linerange):
continue continue
lines.extend(hunklines) lines.extend(hunklines)
if lines: if lines:
yield tmpl('diffblock', parity=next(parity), blockno=blockno, yield web.tmpl('diffblock', parity=next(parity), blockno=blockno,
lines=prettyprintlines(lines, blockno)) lines=prettyprintlines(lines, blockno))
def compare(tmpl, context, leftlines, rightlines): def compare(tmpl, context, leftlines, rightlines):
'''Generator function that provides side-by-side comparison data.''' '''Generator function that provides side-by-side comparison data.'''
def compline(type, leftlineno, leftline, rightlineno, rightline): def compline(type, leftlineno, leftline, rightlineno, rightline):
lineid = leftlineno and ("l%d" % leftlineno) or '' lineid = leftlineno and ("l%d" % leftlineno) or ''
lineid += rightlineno and ("r%d" % rightlineno) or '' lineid += rightlineno and ("r%d" % rightlineno) or ''
llno = '%d' % leftlineno if leftlineno else '' llno = '%d' % leftlineno if leftlineno else ''