webutil.py
783 lines
| 25.1 KiB
| text/x-python
|
PythonLexer
|
r6392 | # hgweb/webutil.py - utility library for the web interface. | ||
# | ||||
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | ||||
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r6392 | |||
|
r27046 | from __future__ import absolute_import | ||
import copy | ||||
import difflib | ||||
import os | ||||
|
r26162 | import re | ||
|
r27046 | |||
from ..i18n import _ | ||||
from ..node import hex, nullid, short | ||||
from .common import ( | ||||
ErrorResponse, | ||||
|
r31665 | HTTP_BAD_REQUEST, | ||
|
r27046 | HTTP_NOT_FOUND, | ||
paritygen, | ||||
) | ||||
from .. import ( | ||||
context, | ||||
error, | ||||
match, | ||||
|
r31808 | mdiff, | ||
r36973 | obsutil, | |||
|
r27046 | patch, | ||
pathutil, | ||||
|
r34808 | pycompat, | ||
|
r37351 | scmutil, | ||
|
r27046 | templatefilters, | ||
r35501 | templatekw, | |||
|
r37533 | templateutil, | ||
|
r27046 | ui as uimod, | ||
util, | ||||
) | ||||
|
r6392 | |||
|
r37102 | from ..utils import ( | ||
stringutil, | ||||
) | ||||
|
r37529 | archivespecs = util.sortdict(( | ||
('zip', ('application/zip', 'zip', '.zip', None)), | ||||
('gz', ('application/x-gzip', 'tgz', '.tar.gz', None)), | ||||
('bz2', ('application/x-bzip2', 'tbz2', '.tar.bz2', None)), | ||||
)) | ||||
|
r37532 | def archivelist(ui, nodeid, url=None): | ||
|
r38215 | allowed = ui.configlist('web', 'allow-archive', untrusted=True) | ||
|
r37531 | archives = [] | ||
for typ, spec in archivespecs.iteritems(): | ||||
if typ in allowed or ui.configbool('web', 'allow' + typ, | ||||
untrusted=True): | ||||
archives.append({ | ||||
'type': typ, | ||||
'extension': spec[2], | ||||
'node': nodeid, | ||||
'url': url, | ||||
}) | ||||
|
r37533 | return templateutil.mappinglist(archives) | ||
|
r37531 | |||
|
r6393 | def up(p): | ||
|
r36731 | if p[0:1] != "/": | ||
|
r6393 | p = "/" + p | ||
|
r36731 | if p[-1:] == "/": | ||
|
r6393 | p = p[:-1] | ||
up = os.path.dirname(p) | ||||
if up == "/": | ||||
return "/" | ||||
return up + "/" | ||||
|
r18391 | def _navseq(step, firststep=None): | ||
if firststep: | ||||
yield firststep | ||||
if firststep >= 20 and firststep <= 40: | ||||
|
r18392 | firststep = 50 | ||
yield firststep | ||||
assert step > 0 | ||||
assert firststep > 0 | ||||
while step <= firststep: | ||||
step *= 10 | ||||
|
r18390 | while True: | ||
|
r18391 | yield 1 * step | ||
yield 3 * step | ||||
step *= 10 | ||||
|
r18389 | |||
|
r18403 | class revnav(object): | ||
|
r18320 | |||
|
r18409 | def __init__(self, repo): | ||
|
r18404 | """Navigation generation object | ||
|
r18409 | :repo: repo object we generate nav for | ||
|
r18404 | """ | ||
|
r18409 | # used for hex generation | ||
self._revlog = repo.changelog | ||||
|
r18404 | |||
|
r18406 | def __nonzero__(self): | ||
"""return True if any revision to navigate over""" | ||||
|
r19094 | return self._first() is not None | ||
|
r31476 | __bool__ = __nonzero__ | ||
|
r19094 | def _first(self): | ||
"""return the minimum non-filtered changeset or None""" | ||||
try: | ||||
|
r29216 | return next(iter(self._revlog)) | ||
|
r19094 | except StopIteration: | ||
return None | ||||
|
r18406 | |||
|
r18405 | def hex(self, rev): | ||
|
r18409 | return hex(self._revlog.node(rev)) | ||
|
r18405 | |||
|
r18404 | def gen(self, pos, pagelen, limit): | ||
|
r18403 | """computes label and revision id for navigation link | ||
|
r18320 | |||
|
r18403 | :pos: is the revision relative to which we generate navigation. | ||
:pagelen: the size of each navigation page | ||||
:limit: how far shall we link | ||||
|
r6393 | |||
|
r18403 | The return is: | ||
|
r37716 | - a single element mappinglist | ||
|
r18403 | - containing a dictionary with a `before` and `after` key | ||
|
r37715 | - values are dictionaries with `label` and `node` keys | ||
|
r18403 | """ | ||
|
r18406 | if not self: | ||
# empty repo | ||||
|
r37716 | return templateutil.mappinglist([ | ||
{'before': templateutil.mappinglist([]), | ||||
'after': templateutil.mappinglist([])}, | ||||
]) | ||||
|
r6393 | |||
|
r18425 | targets = [] | ||
|
r18403 | for f in _navseq(1, pagelen): | ||
if f > limit: | ||||
break | ||||
|
r18425 | targets.append(pos + f) | ||
targets.append(pos - f) | ||||
targets.sort() | ||||
|
r19094 | first = self._first() | ||
|
r37715 | navbefore = [{'label': '(%i)' % first, 'node': self.hex(first)}] | ||
|
r18425 | navafter = [] | ||
for rev in targets: | ||||
|
r18426 | if rev not in self._revlog: | ||
continue | ||||
|
r18425 | if pos < rev < limit: | ||
|
r37715 | navafter.append({'label': '+%d' % abs(rev - pos), | ||
'node': self.hex(rev)}) | ||||
|
r18425 | if 0 < rev < pos: | ||
|
r37715 | navbefore.append({'label': '-%d' % abs(rev - pos), | ||
'node': self.hex(rev)}) | ||||
|
r10254 | |||
|
r37715 | navafter.append({'label': 'tip', 'node': 'tip'}) | ||
|
r18403 | |||
|
r37716 | # TODO: maybe this can be a scalar object supporting tomap() | ||
return templateutil.mappinglist([ | ||||
{'before': templateutil.mappinglist(navbefore), | ||||
'after': templateutil.mappinglist(navafter)}, | ||||
]) | ||||
|
r6393 | |||
|
r18408 | class filerevnav(revnav): | ||
|
r18409 | |||
def __init__(self, repo, path): | ||||
"""Navigation generation object | ||||
:repo: repo object we generate nav for | ||||
:path: path of the file we generate nav for | ||||
""" | ||||
# used for iteration | ||||
self._changelog = repo.unfiltered().changelog | ||||
# used for hex generation | ||||
self._revlog = repo.file(path) | ||||
def hex(self, rev): | ||||
return hex(self._changelog.node(self._revlog.linkrev(rev))) | ||||
|
r37717 | # TODO: maybe this can be a wrapper class for changectx/filectx list, which | ||
# yields {'ctx': ctx} | ||||
|
r37718 | def _ctxsgen(context, ctxs): | ||
|
r37717 | for s in ctxs: | ||
d = { | ||||
'node': s.hex(), | ||||
'rev': s.rev(), | ||||
'user': s.user(), | ||||
'date': s.date(), | ||||
'description': s.description(), | ||||
'branch': s.branch(), | ||||
} | ||||
if util.safehasattr(s, 'path'): | ||||
d['file'] = s.path() | ||||
yield d | ||||
|
r37718 | def _siblings(siblings=None, hiderev=None): | ||
if siblings is None: | ||||
siblings = [] | ||||
siblings = [s for s in siblings if s.node() != nullid] | ||||
if len(siblings) == 1 and siblings[0].rev() == hiderev: | ||||
siblings = [] | ||||
return templateutil.mappinggenerator(_ctxsgen, args=(siblings,)) | ||||
|
r6392 | |||
|
r34391 | def difffeatureopts(req, ui, section): | ||
|
r30081 | diffopts = patch.difffeatureopts(ui, untrusted=True, | ||
|
r34391 | section=section, whitespace=True) | ||
for k in ('ignorews', 'ignorewsamount', 'ignorewseol', 'ignoreblanklines'): | ||||
|
r36902 | v = req.qsparams.get(k) | ||
|
r34391 | if v is not None: | ||
|
r37102 | v = stringutil.parsebool(v) | ||
|
r34404 | setattr(diffopts, k, v if v is not None else True) | ||
|
r34391 | |||
return diffopts | ||||
def annotate(req, fctx, ui): | ||||
diffopts = difffeatureopts(req, ui, 'annotate') | ||||
|
r37083 | return fctx.annotate(follow=True, diffopts=diffopts) | ||
|
r30081 | |||
|
r7671 | def parents(ctx, hide=None): | ||
|
r24136 | if isinstance(ctx, context.basefilectx): | ||
introrev = ctx.introrev() | ||||
if ctx.changectx().rev() != introrev: | ||||
|
r24340 | return _siblings([ctx.repo()[introrev]], hide) | ||
|
r7671 | return _siblings(ctx.parents(), hide) | ||
def children(ctx, hide=None): | ||||
return _siblings(ctx.children(), hide) | ||||
|
r6434 | def renamelink(fctx): | ||
|
r6437 | r = fctx.renamed() | ||
|
r6392 | if r: | ||
|
r37921 | return templateutil.mappinglist([{'file': r[0], 'node': hex(r[1])}]) | ||
return templateutil.mappinglist([]) | ||||
|
r6392 | |||
def nodetagsdict(repo, node): | ||||
|
r37922 | return templateutil.hybridlist(repo.nodetags(node), name='name') | ||
|
r6392 | |||
|
r13596 | def nodebookmarksdict(repo, node): | ||
|
r37923 | return templateutil.hybridlist(repo.nodebookmarks(node), name='name') | ||
|
r13596 | |||
|
r6392 | def nodebranchdict(repo, ctx): | ||
branches = [] | ||||
branch = ctx.branch() | ||||
# If this is an empty repo, ctx.node() == nullid, | ||||
|
r16719 | # ctx.branch() == 'default'. | ||
try: | ||||
branchnode = repo.branchtip(branch) | ||||
except error.RepoLookupError: | ||||
branchnode = None | ||||
if branchnode == ctx.node(): | ||||
|
r37924 | branches.append(branch) | ||
return templateutil.hybridlist(branches, name='name') | ||||
|
r6392 | |||
def nodeinbranch(repo, ctx): | ||||
branches = [] | ||||
branch = ctx.branch() | ||||
|
r16719 | try: | ||
branchnode = repo.branchtip(branch) | ||||
except error.RepoLookupError: | ||||
branchnode = None | ||||
if branch != 'default' and branchnode != ctx.node(): | ||||
|
r37925 | branches.append(branch) | ||
return templateutil.hybridlist(branches, name='name') | ||||
|
r6392 | |||
def nodebranchnodefault(ctx): | ||||
branches = [] | ||||
branch = ctx.branch() | ||||
if branch != 'default': | ||||
|
r37926 | branches.append(branch) | ||
return templateutil.hybridlist(branches, name='name') | ||||
|
r6392 | |||
|
r37930 | def _nodenamesgen(context, f, node, name): | ||
for t in f(node): | ||||
yield {name: t} | ||||
|
r37931 | def showtag(repo, t1, node=nullid): | ||
|
r37930 | args = (repo.nodetags, node, 'tag') | ||
return templateutil.mappinggenerator(_nodenamesgen, args=args, name=t1) | ||||
|
r6392 | |||
|
r37931 | def showbookmark(repo, t1, node=nullid): | ||
|
r37930 | args = (repo.nodebookmarks, node, 'bookmark') | ||
return templateutil.mappinggenerator(_nodenamesgen, args=args, name=t1) | ||||
|
r13596 | |||
r26129 | def branchentries(repo, stripecount, limit=0): | |||
tips = [] | ||||
heads = repo.heads() | ||||
parity = paritygen(stripecount) | ||||
sortkey = lambda item: (not item[1], item[0].rev()) | ||||
|
r37932 | def entries(context): | ||
r26129 | count = 0 | |||
if not tips: | ||||
for tag, hs, tip, closed in repo.branchmap().iterbranches(): | ||||
tips.append((repo[tip], closed)) | ||||
for ctx, closed in sorted(tips, key=sortkey, reverse=True): | ||||
if limit > 0 and count >= limit: | ||||
return | ||||
count += 1 | ||||
if closed: | ||||
status = 'closed' | ||||
elif ctx.node() not in heads: | ||||
status = 'inactive' | ||||
else: | ||||
status = 'open' | ||||
yield { | ||||
|
r29216 | 'parity': next(parity), | ||
r26129 | 'branch': ctx.branch(), | |||
'status': status, | ||||
'node': ctx.hex(), | ||||
'date': ctx.date() | ||||
} | ||||
|
r37932 | return templateutil.mappinggenerator(entries) | ||
r26129 | ||||
|
r6392 | def cleanpath(repo, path): | ||
path = path.lstrip('/') | ||||
|
r20033 | return pathutil.canonpath(repo.root, '', path) | ||
|
r6392 | |||
r25999 | def changectx(repo, req): | |||
|
r17991 | changeid = "tip" | ||
|
r36902 | if 'node' in req.qsparams: | ||
changeid = req.qsparams['node'] | ||||
r25999 | ipos = changeid.find(':') | |||
|
r17991 | if ipos != -1: | ||
changeid = changeid[(ipos + 1):] | ||||
|
r37351 | return scmutil.revsymbol(repo, changeid) | ||
|
r17991 | |||
def basechangectx(repo, req): | ||||
|
r36902 | if 'node' in req.qsparams: | ||
changeid = req.qsparams['node'] | ||||
r25999 | ipos = changeid.find(':') | |||
|
r17991 | if ipos != -1: | ||
changeid = changeid[:ipos] | ||||
|
r37351 | return scmutil.revsymbol(repo, changeid) | ||
|
r17991 | |||
return None | ||||
|
r6392 | def filectx(repo, req): | ||
|
r36902 | if 'file' not in req.qsparams: | ||
|
r17289 | raise ErrorResponse(HTTP_NOT_FOUND, 'file not given') | ||
|
r36902 | path = cleanpath(repo, req.qsparams['file']) | ||
if 'node' in req.qsparams: | ||||
changeid = req.qsparams['node'] | ||||
elif 'filenode' in req.qsparams: | ||||
changeid = req.qsparams['filenode'] | ||||
|
r6392 | else: | ||
|
r17289 | raise ErrorResponse(HTTP_NOT_FOUND, 'node or filenode not given') | ||
|
r6392 | try: | ||
|
r37351 | fctx = scmutil.revsymbol(repo, changeid)[path] | ||
|
r7637 | except error.RepoError: | ||
|
r6392 | fctx = repo.filectx(path, fileid=changeid) | ||
return fctx | ||||
|
r7310 | |||
|
r31665 | def linerange(req): | ||
|
r36902 | linerange = req.qsparams.getall('linerange') | ||
|
r36881 | if not linerange: | ||
|
r31665 | return None | ||
if len(linerange) > 1: | ||||
raise ErrorResponse(HTTP_BAD_REQUEST, | ||||
'redundant linerange parameter') | ||||
try: | ||||
fromline, toline = map(int, linerange[0].split(':', 1)) | ||||
except ValueError: | ||||
raise ErrorResponse(HTTP_BAD_REQUEST, | ||||
'invalid linerange parameter') | ||||
try: | ||||
return util.processlinerange(fromline, toline) | ||||
except error.ParseError as exc: | ||||
|
r36272 | raise ErrorResponse(HTTP_BAD_REQUEST, pycompat.bytestr(exc)) | ||
|
r31665 | |||
def formatlinerange(fromline, toline): | ||||
return '%d:%d' % (fromline + 1, toline) | ||||
|
r37933 | def _succsandmarkersgen(context, mapping): | ||
|
r36612 | repo = context.resource(mapping, 'repo') | ||
|
r37521 | itemmappings = templatekw.showsuccsandmarkers(context, mapping) | ||
for item in itemmappings.tovalue(context, mapping): | ||||
r35502 | item['successors'] = _siblings(repo[successor] | |||
for successor in item['successors']) | ||||
yield item | ||||
r35501 | ||||
|
r37933 | def succsandmarkers(context, mapping): | ||
return templateutil.mappinggenerator(_succsandmarkersgen, args=(mapping,)) | ||||
|
r36612 | # teach templater succsandmarkers is switched to (context, mapping) API | ||
|
r37087 | succsandmarkers._requires = {'repo', 'ctx'} | ||
|
r36612 | |||
|
r37934 | def _whyunstablegen(context, mapping): | ||
r36973 | repo = context.resource(mapping, 'repo') | |||
ctx = context.resource(mapping, 'ctx') | ||||
entries = obsutil.whyunstable(repo, ctx) | ||||
for entry in entries: | ||||
if entry.get('divergentnodes'): | ||||
entry['divergentnodes'] = _siblings(entry['divergentnodes']) | ||||
yield entry | ||||
|
r37934 | def whyunstable(context, mapping): | ||
return templateutil.mappinggenerator(_whyunstablegen, args=(mapping,)) | ||||
|
r37087 | whyunstable._requires = {'repo', 'ctx'} | ||
r36973 | ||||
r27294 | def commonentry(repo, ctx): | |||
node = ctx.node() | ||||
return { | ||||
|
r36535 | # TODO: perhaps ctx.changectx() should be assigned if ctx is a | ||
# filectx, but I'm not pretty sure if that would always work because | ||||
# fctx.parents() != fctx.changectx.parents() for example. | ||||
'ctx': ctx, | ||||
r27294 | 'rev': ctx.rev(), | |||
'node': hex(node), | ||||
'author': ctx.user(), | ||||
'desc': ctx.description(), | ||||
'date': ctx.date(), | ||||
'extra': ctx.extra(), | ||||
'phase': ctx.phasestr(), | ||||
r35087 | 'obsolete': ctx.obsolete(), | |||
|
r36535 | 'succsandmarkers': succsandmarkers, | ||
|
r37935 | 'instabilities': templateutil.hybridlist(ctx.instabilities(), | ||
name='instability'), | ||||
r36973 | 'whyunstable': whyunstable, | |||
r27294 | 'branch': nodebranchnodefault(ctx), | |||
'inbranch': nodeinbranch(repo, ctx), | ||||
'branches': nodebranchdict(repo, ctx), | ||||
'tags': nodetagsdict(repo, node), | ||||
'bookmarks': nodebookmarksdict(repo, node), | ||||
'parent': lambda **x: parents(ctx), | ||||
'child': lambda **x: children(ctx), | ||||
} | ||||
|
r36901 | def changelistentry(web, ctx): | ||
|
r23745 | '''Obtain a dictionary to be used for entries in a changelist. | ||
This function is called when producing items for the "entries" list passed | ||||
to the "shortlog" and "changelog" templates. | ||||
''' | ||||
repo = web.repo | ||||
rev = ctx.rev() | ||||
n = ctx.node() | ||||
|
r37931 | showtags = showtag(repo, 'changelogtag', n) | ||
|
r37973 | files = listfilediffs(ctx.files(), n, web.maxfiles) | ||
|
r23745 | |||
r27294 | entry = commonentry(repo, ctx) | |||
entry.update( | ||||
r28709 | allparents=lambda **x: parents(ctx), | |||
r27294 | parent=lambda **x: parents(ctx, rev - 1), | |||
child=lambda **x: children(ctx, rev + 1), | ||||
changelogtag=showtags, | ||||
files=files, | ||||
) | ||||
return entry | ||||
|
r23745 | |||
|
r38054 | def changelistentries(web, revs, maxcount, parityfn): | ||
"""Emit up to N records for an iterable of revisions.""" | ||||
repo = web.repo | ||||
count = 0 | ||||
for rev in revs: | ||||
if count >= maxcount: | ||||
break | ||||
count += 1 | ||||
entry = changelistentry(web, repo[rev]) | ||||
entry['parity'] = next(parityfn) | ||||
yield entry | ||||
r25602 | def symrevorshortnode(req, ctx): | |||
|
r36902 | if 'node' in req.qsparams: | ||
return templatefilters.revescape(req.qsparams['node']) | ||||
r25602 | else: | |||
return short(ctx.node()) | ||||
|
r37970 | def _listfilesgen(context, ctx, stripecount): | ||
|
r37968 | parity = paritygen(stripecount) | ||
for blockno, f in enumerate(ctx.files()): | ||||
template = 'filenodelink' if f in ctx else 'filenolink' | ||||
|
r37970 | yield context.process(template, { | ||
|
r37968 | 'node': ctx.hex(), | ||
'file': f, | ||||
'blockno': blockno + 1, | ||||
'parity': next(parity), | ||||
}) | ||||
|
r36902 | def changesetentry(web, ctx): | ||
|
r24177 | '''Obtain a dictionary to be used to render the "changeset" template.''' | ||
|
r37931 | showtags = showtag(web.repo, 'changesettag', ctx.node()) | ||
showbookmarks = showbookmark(web.repo, 'changesetbookmark', ctx.node()) | ||||
|
r24177 | showbranch = nodebranchnodefault(ctx) | ||
|
r36902 | basectx = basechangectx(web.repo, web.req) | ||
|
r24177 | if basectx is None: | ||
basectx = ctx.p1() | ||||
|
r34243 | style = web.config('web', 'style') | ||
|
r36902 | if 'style' in web.req.qsparams: | ||
style = web.req.qsparams['style'] | ||||
|
r24177 | |||
|
r36901 | diff = diffs(web, ctx, basectx, None, style) | ||
|
r24177 | |||
parity = paritygen(web.stripecount) | ||||
diffstatsgen = diffstatgen(ctx, basectx) | ||||
|
r38070 | diffstats = diffstat(ctx, diffstatsgen, parity) | ||
|
r24177 | |||
return dict( | ||||
diff=diff, | ||||
|
r36902 | symrev=symrevorshortnode(web.req, ctx), | ||
|
r24177 | basenode=basectx.hex(), | ||
changesettag=showtags, | ||||
changesetbookmark=showbookmarks, | ||||
changesetbranch=showbranch, | ||||
|
r37969 | files=templateutil.mappedgenerator(_listfilesgen, | ||
|
r37970 | args=(ctx, web.stripecount)), | ||
|
r24177 | diffsummary=lambda **x: diffsummary(diffstatsgen), | ||
diffstat=diffstats, | ||||
archives=web.archivelist(ctx.hex()), | ||||
|
r36452 | **pycompat.strkwargs(commonentry(web.repo, ctx))) | ||
|
r24177 | |||
|
r37972 | def _listfilediffsgen(context, files, node, max): | ||
|
r7311 | for f in files[:max]: | ||
|
r37972 | yield context.process('filedifflink', {'node': hex(node), 'file': f}) | ||
|
r7311 | if len(files) > max: | ||
|
r37972 | yield context.process('fileellipses', {}) | ||
|
r7311 | |||
|
r37973 | def listfilediffs(files, node, max): | ||
|
r37971 | return templateutil.mappedgenerator(_listfilediffsgen, | ||
|
r37972 | args=(files, node, max)) | ||
|
r37971 | |||
|
r38006 | def _prettyprintdifflines(context, lines, blockno, lineidprefix): | ||
|
r38004 | for lineno, l in enumerate(lines, 1): | ||
difflineno = "%d.%d" % (blockno, lineno) | ||||
if l.startswith('+'): | ||||
ltype = "difflineplus" | ||||
elif l.startswith('-'): | ||||
ltype = "difflineminus" | ||||
elif l.startswith('@'): | ||||
ltype = "difflineat" | ||||
else: | ||||
ltype = "diffline" | ||||
|
r38006 | yield context.process(ltype, { | ||
|
r38004 | 'line': l, | ||
'lineno': lineno, | ||||
'lineid': lineidprefix + "l%s" % difflineno, | ||||
'linenumber': "% 8s" % difflineno, | ||||
}) | ||||
|
r38007 | def _diffsgen(context, repo, ctx, basectx, files, style, stripecount, | ||
linerange, lineidprefix): | ||||
|
r7310 | if files: | ||
m = match.exact(repo.root, repo.getcwd(), files) | ||||
else: | ||||
m = match.always(repo.root, repo.getcwd()) | ||||
diffopts = patch.diffopts(repo.ui, untrusted=True) | ||||
|
r31082 | node1 = basectx.node() | ||
|
r7310 | node2 = ctx.node() | ||
|
r38007 | parity = paritygen(stripecount) | ||
|
r7310 | |||
|
r31276 | diffhunks = patch.diffhunks(repo, node1, node2, m, opts=diffopts) | ||
|
r34856 | for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1): | ||
|
r31276 | if style != 'raw': | ||
header = header[1:] | ||||
lines = [h + '\n' for h in header] | ||||
for hunkrange, hunklines in hunks: | ||||
|
r31666 | if linerange is not None and hunkrange is not None: | ||
s1, l1, s2, l2 = hunkrange | ||||
|
r31808 | if not mdiff.hunkinrange((s2, l2), linerange): | ||
|
r31666 | continue | ||
|
r31276 | lines.extend(hunklines) | ||
if lines: | ||||
|
r38005 | l = templateutil.mappedgenerator(_prettyprintdifflines, | ||
|
r38006 | args=(lines, blockno, | ||
|
r38005 | lineidprefix)) | ||
|
r38007 | yield { | ||
|
r37037 | 'parity': next(parity), | ||
'blockno': blockno, | ||||
|
r38005 | 'lines': l, | ||
|
r38007 | } | ||
def diffs(web, ctx, basectx, files, style, linerange=None, lineidprefix=''): | ||||
args = (web.repo, ctx, basectx, files, style, web.stripecount, | ||||
linerange, lineidprefix) | ||||
return templateutil.mappinggenerator(_diffsgen, args=args, name='diffblock') | ||||
|
r7345 | |||
|
r38010 | def _compline(type, leftlineno, leftline, rightlineno, rightline): | ||
|
r38008 | lineid = leftlineno and ("l%d" % leftlineno) or '' | ||
lineid += rightlineno and ("r%d" % rightlineno) or '' | ||||
llno = '%d' % leftlineno if leftlineno else '' | ||||
rlno = '%d' % rightlineno if rightlineno else '' | ||||
|
r38010 | return { | ||
|
r38008 | 'type': type, | ||
'lineid': lineid, | ||||
'leftlineno': leftlineno, | ||||
'leftlinenumber': "% 6s" % llno, | ||||
'leftline': leftline or '', | ||||
'rightlineno': rightlineno, | ||||
'rightlinenumber': "% 6s" % rlno, | ||||
'rightline': rightline or '', | ||||
|
r38010 | } | ||
|
r38008 | |||
|
r38010 | def _getcompblockgen(context, leftlines, rightlines, opcodes): | ||
|
r38009 | for type, llo, lhi, rlo, rhi in opcodes: | ||
len1 = lhi - llo | ||||
len2 = rhi - rlo | ||||
count = min(len1, len2) | ||||
for i in xrange(count): | ||||
|
r38010 | yield _compline(type=type, | ||
|
r38009 | leftlineno=llo + i + 1, | ||
leftline=leftlines[llo + i], | ||||
rightlineno=rlo + i + 1, | ||||
rightline=rightlines[rlo + i]) | ||||
if len1 > len2: | ||||
for i in xrange(llo + count, lhi): | ||||
|
r38010 | yield _compline(type=type, | ||
|
r38009 | leftlineno=i + 1, | ||
leftline=leftlines[i], | ||||
rightlineno=None, | ||||
rightline=None) | ||||
elif len2 > len1: | ||||
for i in xrange(rlo + count, rhi): | ||||
|
r38010 | yield _compline(type=type, | ||
|
r38009 | leftlineno=None, | ||
leftline=None, | ||||
rightlineno=i + 1, | ||||
rightline=rightlines[i]) | ||||
|
r17202 | |||
|
r38010 | def _getcompblock(leftlines, rightlines, opcodes): | ||
args = (leftlines, rightlines, opcodes) | ||||
return templateutil.mappinggenerator(_getcompblockgen, args=args, | ||||
name='comparisonline') | ||||
|
r38012 | def _comparegen(context, contextnum, leftlines, rightlines): | ||
|
r38009 | '''Generator function that provides side-by-side comparison data.''' | ||
|
r17202 | s = difflib.SequenceMatcher(None, leftlines, rightlines) | ||
|
r38011 | if contextnum < 0: | ||
|
r38010 | l = _getcompblock(leftlines, rightlines, s.get_opcodes()) | ||
|
r38012 | yield {'lines': l} | ||
|
r17202 | else: | ||
|
r38011 | for oc in s.get_grouped_opcodes(n=contextnum): | ||
|
r38010 | l = _getcompblock(leftlines, rightlines, oc) | ||
|
r38012 | yield {'lines': l} | ||
|
r38013 | def compare(contextnum, leftlines, rightlines): | ||
|
r38012 | args = (contextnum, leftlines, rightlines) | ||
return templateutil.mappinggenerator(_comparegen, args=args, | ||||
name='comparisonblock') | ||||
|
r17202 | |||
|
r17991 | def diffstatgen(ctx, basectx): | ||
|
r14570 | '''Generator function that provides the diffstat data.''' | ||
|
r14490 | |||
|
r35445 | stats = patch.diffstatdata( | ||
util.iterlines(ctx.diff(basectx, noprefix=False))) | ||||
|
r14490 | maxname, maxtotal, addtotal, removetotal, binary = patch.diffstatsum(stats) | ||
|
r14570 | while True: | ||
yield stats, maxname, maxtotal, addtotal, removetotal, binary | ||||
def diffsummary(statgen): | ||||
'''Return a short summary of the diff.''' | ||||
|
r29216 | stats, maxname, maxtotal, addtotal, removetotal, binary = next(statgen) | ||
|
r14570 | return _(' %d files changed, %d insertions(+), %d deletions(-)\n') % ( | ||
len(stats), addtotal, removetotal) | ||||
|
r38069 | def _diffstattmplgen(context, ctx, statgen, parity): | ||
|
r29216 | stats, maxname, maxtotal, addtotal, removetotal, binary = next(statgen) | ||
|
r14561 | files = ctx.files() | ||
|
r14490 | |||
|
r14561 | def pct(i): | ||
if maxtotal == 0: | ||||
return 0 | ||||
return (float(i) / maxtotal) * 100 | ||||
|
r14490 | |||
|
r14562 | fileno = 0 | ||
|
r14561 | for filename, adds, removes, isbinary in stats: | ||
r35315 | template = 'diffstatlink' if filename in files else 'diffstatnolink' | |||
|
r14561 | total = adds + removes | ||
|
r14562 | fileno += 1 | ||
|
r38069 | yield context.process(template, { | ||
|
r37037 | 'node': ctx.hex(), | ||
'file': filename, | ||||
'fileno': fileno, | ||||
'total': total, | ||||
'addpct': pct(adds), | ||||
'removepct': pct(removes), | ||||
'parity': next(parity), | ||||
}) | ||||
|
r14490 | |||
|
r38070 | def diffstat(ctx, statgen, parity): | ||
|
r38068 | '''Return a diffstat template for each file in the diff.''' | ||
|
r38069 | args = (ctx, statgen, parity) | ||
|
r38068 | return templateutil.mappedgenerator(_diffstattmplgen, args=args) | ||
|
r37714 | class sessionvars(templateutil.wrapped): | ||
|
r7345 | def __init__(self, vars, start='?'): | ||
|
r37712 | self._start = start | ||
self._vars = vars | ||||
|
r37713 | |||
|
r7345 | def __getitem__(self, key): | ||
|
r37712 | return self._vars[key] | ||
|
r37713 | |||
|
r7345 | def __setitem__(self, key, value): | ||
|
r37712 | self._vars[key] = value | ||
|
r37713 | |||
|
r7345 | def __copy__(self): | ||
|
r37712 | return sessionvars(copy.copy(self._vars), self._start) | ||
|
r37713 | |||
|
r37714 | def itermaps(self, context): | ||
|
r37712 | separator = self._start | ||
for key, value in sorted(self._vars.iteritems()): | ||||
|
r34808 | yield {'name': key, | ||
'value': pycompat.bytestr(value), | ||||
'separator': separator, | ||||
} | ||||
|
r7345 | separator = '&' | ||
|
r12691 | |||
|
r37714 | def join(self, context, mapping, sep): | ||
# could be '{separator}{name}={value|urlescape}' | ||||
raise error.ParseError(_('not displayable without template')) | ||||
def show(self, context, mapping): | ||||
return self.join(context, '') | ||||
def tovalue(self, context, mapping): | ||||
return self._vars | ||||
|
r27007 | class wsgiui(uimod.ui): | ||
|
r12691 | # default termwidth breaks under mod_wsgi | ||
def termwidth(self): | ||||
return 80 | ||||
|
r26162 | |||
def getwebsubs(repo): | ||||
websubtable = [] | ||||
websubdefs = repo.ui.configitems('websub') | ||||
# we must maintain interhg backwards compatibility | ||||
websubdefs += repo.ui.configitems('interhg') | ||||
for key, pattern in websubdefs: | ||||
# grab the delimiter from the character after the "s" | ||||
|
r36198 | unesc = pattern[1:2] | ||
|
r26162 | delim = re.escape(unesc) | ||
# identify portions of the pattern, taking care to avoid escaped | ||||
# delimiters. the replace format and flags are optional, but | ||||
# delimiters are required. | ||||
match = re.match( | ||||
|
r36201 | br'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$' | ||
|
r26162 | % (delim, delim, delim), pattern) | ||
if not match: | ||||
repo.ui.warn(_("websub: invalid pattern for %s: %s\n") | ||||
% (key, pattern)) | ||||
continue | ||||
# we need to unescape the delimiter for regexp and format | ||||
|
r36201 | delim_re = re.compile(br'(?<!\\)\\%s' % delim) | ||
|
r26162 | regexp = delim_re.sub(unesc, match.group(1)) | ||
format = delim_re.sub(unesc, match.group(2)) | ||||
# the pattern allows for 6 regexp flags, so set them if necessary | ||||
flagin = match.group(3) | ||||
flags = 0 | ||||
if flagin: | ||||
for flag in flagin.upper(): | ||||
flags |= re.__dict__[flag] | ||||
try: | ||||
regexp = re.compile(regexp, flags) | ||||
websubtable.append((regexp, format)) | ||||
except re.error: | ||||
repo.ui.warn(_("websub: invalid regexp for %s: %s\n") | ||||
% (key, regexp)) | ||||
return websubtable | ||||
r37928 | ||||
def getgraphnode(repo, ctx): | ||||
return (templatekw.getgraphnodecurrent(repo, ctx) + | ||||
templatekw.getgraphnodesymbol(ctx)) | ||||