##// END OF EJS Templates
wireproto: add streams to frame-based protocol...
wireproto: add streams to frame-based protocol Previously, the frame-based protocol was just a series of frames, with each frame associated with a request ID. In order to scale the protocol, we'll want to enable the use of compression. While it is possible to enable compression at the socket/pipe level, this has its disadvantages. The big one is it undermines the point of frames being standalone, atomic units that can be read and written: if you add compression above the framing protocol, you are back to having a stream-based protocol as opposed to something frame-based. So in order to preserve frames, compression needs to occur at the frame payload level. Compressing each frame's payload individually will limit compression ratios because the window size of the compressor will be limited by the max frame size, which is 32-64kb as currently defined. It will also add CPU overhead, as it is more efficient for compressors to operate on fewer, larger blocks of data than more, smaller blocks. So compressing each frame independently is out. This means we need to compress each frame's payload as if it is part of a larger stream. The simplest approach is to have 1 stream per connection. This could certainly work. However, it has disadvantages (documented below). We could also have 1 stream per RPC/command invocation. (This is the model HTTP/2 goes with.) This also has disadvantages. The main disadvantage to one global stream is that it has the very real potential to create CPU bottlenecks doing compression. Networks are only getting faster and the performance of single CPU cores has been relatively flat. Newer compression formats like zstandard offer better CPU cycle efficiency than predecessors like zlib. But it still all too common to saturate your CPU with compression overhead long before you saturate the network pipe. The main disadvantage with streams per request is that you can't reap the benefits of the compression context for multiple requests. For example, if you send 1000 RPC requests (or HTTP/2 requests for that matter), the response to each would have its own compression context. The overall size of the raw responses would be larger because compression contexts wouldn't be able to reference data from another request or response. The approach for streams as implemented in this commit is to support N streams per connection and for streams to potentially span requests and responses. As explained by the added internals docs, this facilitates servers and clients delegating independent streams and compression to independent threads / CPU cores. This helps alleviate the CPU bottleneck of compression. This design also allows compression contexts to be reused across requests/responses. This can result in improved compression ratios and less overhead for compressors and decompressors having to build new contexts. Another feature that was defined was the ability for individual frames within a stream to declare whether that individual frame's payload uses the content encoding (read: compression) defined by the stream. The idea here is that some servers may serve data from a combination of caches and dynamic resolution. Data coming from caches may be pre-compressed. We want to facilitate servers being able to essentially stream bytes from caches to the wire with minimal overhead. Being able to mix and match with frames are compressed within a stream enables these types of advanced server functionality. This commit defines the new streams mechanism. Basic code for supporting streams in frames has been added. But that code is seriously lacking and doesn't fully conform to the defined protocol. For example, we don't close any streams. And support for content encoding within streams is not yet implemented. The change was rather invasive and I didn't think it would be reasonable to implement the entire feature in a single commit. For the record, I would have loved to reuse an existing multiplexing protocol to build the new wire protocol on top of. However, I couldn't find a protocol that offers the performance and scaling characteristics that I desired. Namely, it should support multiple compression contexts to facilitate scaling out to multiple CPU cores and compression contexts should be able to live longer than single RPC requests. HTTP/2 *almost* fits the bill. But the semantics of HTTP message exchange state that streams can only live for a single request-response. We /could/ tunnel on top of HTTP/2 streams and frames with HEADER and DATA frames. But there's no guarantee that HTTP/2 libraries and proxies would allow us to use HTTP/2 streams and frames without the HTTP message exchange semantics defined in RFC 7540 Section 8. Other RPC protocols like gRPC tunnel are built on top of HTTP/2 and thus preserve its semantics of stream per RPC invocation. Even QUIC does this. We could attempt to invent a higher-level stream that spans HTTP/2 streams. But this would be violating HTTP/2 because there is no guarantee that HTTP/2 streams are routed to the same server. The best we can do - which is what this protocol does - is shoehorn all request and response data into a single HTTP message and create streams within. At that point, we've defined a Content-Type in HTTP parlance. It just so happens our media type can also work as a standalone, stream-based protocol, without leaning on HTTP or similar protocol. Differential Revision: https://phab.mercurial-scm.org/D2907

File last commit:

r37102:f0b6fbea default
r37304:9bfcbe4f default
Show More
webcommands.py
1489 lines | 44.4 KiB | text/x-python | PythonLexer
#
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import copy
import mimetypes
import os
import re
from ..i18n import _
from ..node import hex, nullid, short
from .common import (
ErrorResponse,
HTTP_FORBIDDEN,
HTTP_NOT_FOUND,
get_contact,
paritygen,
staticfile,
)
from .. import (
archival,
dagop,
encoding,
error,
graphmod,
pycompat,
revset,
revsetlang,
scmutil,
smartset,
templater,
)
from ..utils import (
stringutil,
)
from . import (
webutil,
)
__all__ = []
commands = {}
class webcommand(object):
"""Decorator used to register a web command handler.
The decorator takes as its positional arguments the name/path the
command should be accessible under.
When called, functions receive as arguments a ``requestcontext``,
``wsgirequest``, and a templater instance for generatoring output.
The functions should populate the ``rctx.res`` object with details
about the HTTP response.
The function returns a generator to be consumed by the WSGI application.
For most commands, this should be the result from
``web.res.sendresponse()``. Many commands will call ``web.sendtemplate()``
to render a template.
Usage:
@webcommand('mycommand')
def mycommand(web):
pass
"""
def __init__(self, name):
self.name = name
def __call__(self, func):
__all__.append(self.name)
commands[self.name] = func
return func
@webcommand('log')
def log(web):
"""
/log[/{revision}[/{path}]]
--------------------------
Show repository or file history.
For URLs of the form ``/log/{revision}``, a list of changesets starting at
the specified changeset identifier is shown. If ``{revision}`` is not
defined, the default is ``tip``. This form is equivalent to the
``changelog`` handler.
For URLs of the form ``/log/{revision}/{file}``, the history for a specific
file will be shown. This form is equivalent to the ``filelog`` handler.
"""
if web.req.qsparams.get('file'):
return filelog(web)
else:
return changelog(web)
@webcommand('rawfile')
def rawfile(web):
guessmime = web.configbool('web', 'guessmime')
path = webutil.cleanpath(web.repo, web.req.qsparams.get('file', ''))
if not path:
return manifest(web)
try:
fctx = webutil.filectx(web.repo, web.req)
except error.LookupError as inst:
try:
return manifest(web)
except ErrorResponse:
raise inst
path = fctx.path()
text = fctx.data()
mt = 'application/binary'
if guessmime:
mt = mimetypes.guess_type(path)[0]
if mt is None:
if stringutil.binary(text):
mt = 'application/binary'
else:
mt = 'text/plain'
if mt.startswith('text/'):
mt += '; charset="%s"' % encoding.encoding
web.res.headers['Content-Type'] = mt
filename = (path.rpartition('/')[-1]
.replace('\\', '\\\\').replace('"', '\\"'))
web.res.headers['Content-Disposition'] = 'inline; filename="%s"' % filename
web.res.setbodybytes(text)
return web.res.sendresponse()
def _filerevision(web, fctx):
f = fctx.path()
text = fctx.data()
parity = paritygen(web.stripecount)
ishead = fctx.filerev() in fctx.filelog().headrevs()
if stringutil.binary(text):
mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
text = '(binary:%s)' % mt
def lines():
for lineno, t in enumerate(text.splitlines(True)):
yield {"line": t,
"lineid": "l%d" % (lineno + 1),
"linenumber": "% 6d" % (lineno + 1),
"parity": next(parity)}
return web.sendtemplate(
'filerevision',
file=f,
path=webutil.up(f),
text=lines(),
symrev=webutil.symrevorshortnode(web.req, fctx),
rename=webutil.renamelink(fctx),
permissions=fctx.manifest().flags(f),
ishead=int(ishead),
**pycompat.strkwargs(webutil.commonentry(web.repo, fctx)))
@webcommand('file')
def file(web):
"""
/file/{revision}[/{path}]
-------------------------
Show information about a directory or file in the repository.
Info about the ``path`` given as a URL parameter will be rendered.
If ``path`` is a directory, information about the entries in that
directory will be rendered. This form is equivalent to the ``manifest``
handler.
If ``path`` is a file, information about that file will be shown via
the ``filerevision`` template.
If ``path`` is not defined, information about the root directory will
be rendered.
"""
if web.req.qsparams.get('style') == 'raw':
return rawfile(web)
path = webutil.cleanpath(web.repo, web.req.qsparams.get('file', ''))
if not path:
return manifest(web)
try:
return _filerevision(web, webutil.filectx(web.repo, web.req))
except error.LookupError as inst:
try:
return manifest(web)
except ErrorResponse:
raise inst
def _search(web):
MODE_REVISION = 'rev'
MODE_KEYWORD = 'keyword'
MODE_REVSET = 'revset'
def revsearch(ctx):
yield ctx
def keywordsearch(query):
lower = encoding.lower
qw = lower(query).split()
def revgen():
cl = web.repo.changelog
for i in xrange(len(web.repo) - 1, 0, -100):
l = []
for j in cl.revs(max(0, i - 99), i):
ctx = web.repo[j]
l.append(ctx)
l.reverse()
for e in l:
yield e
for ctx in revgen():
miss = 0
for q in qw:
if not (q in lower(ctx.user()) or
q in lower(ctx.description()) or
q in lower(" ".join(ctx.files()))):
miss = 1
break
if miss:
continue
yield ctx
def revsetsearch(revs):
for r in revs:
yield web.repo[r]
searchfuncs = {
MODE_REVISION: (revsearch, 'exact revision search'),
MODE_KEYWORD: (keywordsearch, 'literal keyword search'),
MODE_REVSET: (revsetsearch, 'revset expression search'),
}
def getsearchmode(query):
try:
ctx = web.repo[query]
except (error.RepoError, error.LookupError):
# query is not an exact revision pointer, need to
# decide if it's a revset expression or keywords
pass
else:
return MODE_REVISION, ctx
revdef = 'reverse(%s)' % query
try:
tree = revsetlang.parse(revdef)
except error.ParseError:
# can't parse to a revset tree
return MODE_KEYWORD, query
if revsetlang.depth(tree) <= 2:
# no revset syntax used
return MODE_KEYWORD, query
if any((token, (value or '')[:3]) == ('string', 're:')
for token, value, pos in revsetlang.tokenize(revdef)):
return MODE_KEYWORD, query
funcsused = revsetlang.funcsused(tree)
if not funcsused.issubset(revset.safesymbols):
return MODE_KEYWORD, query
mfunc = revset.match(web.repo.ui, revdef, repo=web.repo)
try:
revs = mfunc(web.repo)
return MODE_REVSET, revs
# ParseError: wrongly placed tokens, wrongs arguments, etc
# RepoLookupError: no such revision, e.g. in 'revision:'
# Abort: bookmark/tag not exists
# LookupError: ambiguous identifier, e.g. in '(bc)' on a large repo
except (error.ParseError, error.RepoLookupError, error.Abort,
LookupError):
return MODE_KEYWORD, query
def changelist(**map):
count = 0
for ctx in searchfunc[0](funcarg):
count += 1
n = ctx.node()
showtags = webutil.showtag(web.repo, web.tmpl, 'changelogtag', n)
files = webutil.listfilediffs(web.tmpl, ctx.files(), n,
web.maxfiles)
lm = webutil.commonentry(web.repo, ctx)
lm.update({
'parity': next(parity),
'changelogtag': showtags,
'files': files,
})
yield web.tmpl.generate('searchentry', lm)
if count >= revcount:
break
query = web.req.qsparams['rev']
revcount = web.maxchanges
if 'revcount' in web.req.qsparams:
try:
revcount = int(web.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1)
web.tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError:
pass
lessvars = copy.copy(web.tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1)
lessvars['rev'] = query
morevars = copy.copy(web.tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2
morevars['rev'] = query
mode, funcarg = getsearchmode(query)
if 'forcekw' in web.req.qsparams:
showforcekw = ''
showunforcekw = searchfuncs[mode][1]
mode = MODE_KEYWORD
funcarg = query
else:
if mode != MODE_KEYWORD:
showforcekw = searchfuncs[MODE_KEYWORD][1]
else:
showforcekw = ''
showunforcekw = ''
searchfunc = searchfuncs[mode]
tip = web.repo['tip']
parity = paritygen(web.stripecount)
return web.sendtemplate(
'search',
query=query,
node=tip.hex(),
symrev='tip',
entries=changelist,
archives=web.archivelist('tip'),
morevars=morevars,
lessvars=lessvars,
modedesc=searchfunc[1],
showforcekw=showforcekw,
showunforcekw=showunforcekw)
@webcommand('changelog')
def changelog(web, shortlog=False):
"""
/changelog[/{revision}]
-----------------------
Show information about multiple changesets.
If the optional ``revision`` URL argument is absent, information about
all changesets starting at ``tip`` will be rendered. If the ``revision``
argument is present, changesets will be shown starting from the specified
revision.
If ``revision`` is absent, the ``rev`` query string argument may be
defined. This will perform a search for changesets.
The argument for ``rev`` can be a single revision, a revision set,
or a literal keyword to search for in changeset data (equivalent to
:hg:`log -k`).
The ``revcount`` query string argument defines the maximum numbers of
changesets to render.
For non-searches, the ``changelog`` template will be rendered.
"""
query = ''
if 'node' in web.req.qsparams:
ctx = webutil.changectx(web.repo, web.req)
symrev = webutil.symrevorshortnode(web.req, ctx)
elif 'rev' in web.req.qsparams:
return _search(web)
else:
ctx = web.repo['tip']
symrev = 'tip'
def changelist():
revs = []
if pos != -1:
revs = web.repo.changelog.revs(pos, 0)
curcount = 0
for rev in revs:
curcount += 1
if curcount > revcount + 1:
break
entry = webutil.changelistentry(web, web.repo[rev])
entry['parity'] = next(parity)
yield entry
if shortlog:
revcount = web.maxshortchanges
else:
revcount = web.maxchanges
if 'revcount' in web.req.qsparams:
try:
revcount = int(web.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1)
web.tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError:
pass
lessvars = copy.copy(web.tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(web.tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2
count = len(web.repo)
pos = ctx.rev()
parity = paritygen(web.stripecount)
changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
entries = list(changelist())
latestentry = entries[:1]
if len(entries) > revcount:
nextentry = entries[-1:]
entries = entries[:-1]
else:
nextentry = []
return web.sendtemplate(
'shortlog' if shortlog else 'changelog',
changenav=changenav,
node=ctx.hex(),
rev=pos,
symrev=symrev,
changesets=count,
entries=entries,
latestentry=latestentry,
nextentry=nextentry,
archives=web.archivelist('tip'),
revcount=revcount,
morevars=morevars,
lessvars=lessvars,
query=query)
@webcommand('shortlog')
def shortlog(web):
"""
/shortlog
---------
Show basic information about a set of changesets.
This accepts the same parameters as the ``changelog`` handler. The only
difference is the ``shortlog`` template will be rendered instead of the
``changelog`` template.
"""
return changelog(web, shortlog=True)
@webcommand('changeset')
def changeset(web):
"""
/changeset[/{revision}]
-----------------------
Show information about a single changeset.
A URL path argument is the changeset identifier to show. See ``hg help
revisions`` for possible values. If not defined, the ``tip`` changeset
will be shown.
The ``changeset`` template is rendered. Contents of the ``changesettag``,
``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many
templates related to diffs may all be used to produce the output.
"""
ctx = webutil.changectx(web.repo, web.req)
return web.sendtemplate(
'changeset',
**webutil.changesetentry(web, ctx))
rev = webcommand('rev')(changeset)
def decodepath(path):
"""Hook for mapping a path in the repository to a path in the
working copy.
Extensions (e.g., largefiles) can override this to remap files in
the virtual file system presented by the manifest command below."""
return path
@webcommand('manifest')
def manifest(web):
"""
/manifest[/{revision}[/{path}]]
-------------------------------
Show information about a directory.
If the URL path arguments are omitted, information about the root
directory for the ``tip`` changeset will be shown.
Because this handler can only show information for directories, it
is recommended to use the ``file`` handler instead, as it can handle both
directories and files.
The ``manifest`` template will be rendered for this handler.
"""
if 'node' in web.req.qsparams:
ctx = webutil.changectx(web.repo, web.req)
symrev = webutil.symrevorshortnode(web.req, ctx)
else:
ctx = web.repo['tip']
symrev = 'tip'
path = webutil.cleanpath(web.repo, web.req.qsparams.get('file', ''))
mf = ctx.manifest()
node = ctx.node()
files = {}
dirs = {}
parity = paritygen(web.stripecount)
if path and path[-1:] != "/":
path += "/"
l = len(path)
abspath = "/" + path
for full, n in mf.iteritems():
# the virtual path (working copy path) used for the full
# (repository) path
f = decodepath(full)
if f[:l] != path:
continue
remain = f[l:]
elements = remain.split('/')
if len(elements) == 1:
files[remain] = full
else:
h = dirs # need to retain ref to dirs (root)
for elem in elements[0:-1]:
if elem not in h:
h[elem] = {}
h = h[elem]
if len(h) > 1:
break
h[None] = None # denotes files present
if mf and not files and not dirs:
raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
def filelist(**map):
for f in sorted(files):
full = files[f]
fctx = ctx.filectx(full)
yield {"file": full,
"parity": next(parity),
"basename": f,
"date": fctx.date(),
"size": fctx.size(),
"permissions": mf.flags(full)}
def dirlist(**map):
for d in sorted(dirs):
emptydirs = []
h = dirs[d]
while isinstance(h, dict) and len(h) == 1:
k, v = next(iter(h.items()))
if v:
emptydirs.append(k)
h = v
path = "%s%s" % (abspath, d)
yield {"parity": next(parity),
"path": path,
"emptydirs": "/".join(emptydirs),
"basename": d}
return web.sendtemplate(
'manifest',
symrev=symrev,
path=abspath,
up=webutil.up(abspath),
upparity=next(parity),
fentries=filelist,
dentries=dirlist,
archives=web.archivelist(hex(node)),
**pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
@webcommand('tags')
def tags(web):
"""
/tags
-----
Show information about tags.
No arguments are accepted.
The ``tags`` template is rendered.
"""
i = list(reversed(web.repo.tagslist()))
parity = paritygen(web.stripecount)
def entries(notip, latestonly, **map):
t = i
if notip:
t = [(k, n) for k, n in i if k != "tip"]
if latestonly:
t = t[:1]
for k, n in t:
yield {"parity": next(parity),
"tag": k,
"date": web.repo[n].date(),
"node": hex(n)}
return web.sendtemplate(
'tags',
node=hex(web.repo.changelog.tip()),
entries=lambda **x: entries(False, False, **x),
entriesnotip=lambda **x: entries(True, False, **x),
latestentry=lambda **x: entries(True, True, **x))
@webcommand('bookmarks')
def bookmarks(web):
"""
/bookmarks
----------
Show information about bookmarks.
No arguments are accepted.
The ``bookmarks`` template is rendered.
"""
i = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
i = sorted(i, key=sortkey, reverse=True)
parity = paritygen(web.stripecount)
def entries(latestonly, **map):
t = i
if latestonly:
t = i[:1]
for k, n in t:
yield {"parity": next(parity),
"bookmark": k,
"date": web.repo[n].date(),
"node": hex(n)}
if i:
latestrev = i[0][1]
else:
latestrev = -1
return web.sendtemplate(
'bookmarks',
node=hex(web.repo.changelog.tip()),
lastchange=[{'date': web.repo[latestrev].date()}],
entries=lambda **x: entries(latestonly=False, **x),
latestentry=lambda **x: entries(latestonly=True, **x))
@webcommand('branches')
def branches(web):
"""
/branches
---------
Show information about branches.
All known branches are contained in the output, even closed branches.
No arguments are accepted.
The ``branches`` template is rendered.
"""
entries = webutil.branchentries(web.repo, web.stripecount)
latestentry = webutil.branchentries(web.repo, web.stripecount, 1)
return web.sendtemplate(
'branches',
node=hex(web.repo.changelog.tip()),
entries=entries,
latestentry=latestentry)
@webcommand('summary')
def summary(web):
"""
/summary
--------
Show a summary of repository state.
Information about the latest changesets, bookmarks, tags, and branches
is captured by this handler.
The ``summary`` template is rendered.
"""
i = reversed(web.repo.tagslist())
def tagentries(**map):
parity = paritygen(web.stripecount)
count = 0
for k, n in i:
if k == "tip": # skip tip
continue
count += 1
if count > 10: # limit to 10 tags
break
yield web.tmpl.generate('tagentry', {
'parity': next(parity),
'tag': k,
'node': hex(n),
'date': web.repo[n].date(),
})
def bookmarks(**map):
parity = paritygen(web.stripecount)
marks = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
marks = sorted(marks, key=sortkey, reverse=True)
for k, n in marks[:10]: # limit to 10 bookmarks
yield {'parity': next(parity),
'bookmark': k,
'date': web.repo[n].date(),
'node': hex(n)}
def changelist(**map):
parity = paritygen(web.stripecount, offset=start - end)
l = [] # build a list in forward order for efficiency
revs = []
if start < end:
revs = web.repo.changelog.revs(start, end - 1)
for i in revs:
ctx = web.repo[i]
lm = webutil.commonentry(web.repo, ctx)
lm['parity'] = next(parity)
l.append(web.tmpl.generate('shortlogentry', lm))
for entry in reversed(l):
yield entry
tip = web.repo['tip']
count = len(web.repo)
start = max(0, count - web.maxchanges)
end = min(count, start + web.maxchanges)
desc = web.config("web", "description")
if not desc:
desc = 'unknown'
return web.sendtemplate(
'summary',
desc=desc,
owner=get_contact(web.config) or 'unknown',
lastchange=tip.date(),
tags=tagentries,
bookmarks=bookmarks,
branches=webutil.branchentries(web.repo, web.stripecount, 10),
shortlog=changelist,
node=tip.hex(),
symrev='tip',
archives=web.archivelist('tip'),
labels=web.configlist('web', 'labels'))
@webcommand('filediff')
def filediff(web):
"""
/diff/{revision}/{path}
-----------------------
Show how a file changed in a particular commit.
The ``filediff`` template is rendered.
This handler is registered under both the ``/diff`` and ``/filediff``
paths. ``/diff`` is used in modern code.
"""
fctx, ctx = None, None
try:
fctx = webutil.filectx(web.repo, web.req)
except LookupError:
ctx = webutil.changectx(web.repo, web.req)
path = webutil.cleanpath(web.repo, web.req.qsparams['file'])
if path not in ctx.files():
raise
if fctx is not None:
path = fctx.path()
ctx = fctx.changectx()
basectx = ctx.p1()
style = web.config('web', 'style')
if 'style' in web.req.qsparams:
style = web.req.qsparams['style']
diffs = webutil.diffs(web, ctx, basectx, [path], style)
if fctx is not None:
rename = webutil.renamelink(fctx)
ctx = fctx
else:
rename = []
ctx = ctx
return web.sendtemplate(
'filediff',
file=path,
symrev=webutil.symrevorshortnode(web.req, ctx),
rename=rename,
diff=diffs,
**pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
diff = webcommand('diff')(filediff)
@webcommand('comparison')
def comparison(web):
"""
/comparison/{revision}/{path}
-----------------------------
Show a comparison between the old and new versions of a file from changes
made on a particular revision.
This is similar to the ``diff`` handler. However, this form features
a split or side-by-side diff rather than a unified diff.
The ``context`` query string argument can be used to control the lines of
context in the diff.
The ``filecomparison`` template is rendered.
"""
ctx = webutil.changectx(web.repo, web.req)
if 'file' not in web.req.qsparams:
raise ErrorResponse(HTTP_NOT_FOUND, 'file not given')
path = webutil.cleanpath(web.repo, web.req.qsparams['file'])
parsecontext = lambda v: v == 'full' and -1 or int(v)
if 'context' in web.req.qsparams:
context = parsecontext(web.req.qsparams['context'])
else:
context = parsecontext(web.config('web', 'comparisoncontext', '5'))
def filelines(f):
if f.isbinary():
mt = mimetypes.guess_type(f.path())[0]
if not mt:
mt = 'application/octet-stream'
return [_('(binary file %s, hash: %s)') % (mt, hex(f.filenode()))]
return f.data().splitlines()
fctx = None
parent = ctx.p1()
leftrev = parent.rev()
leftnode = parent.node()
rightrev = ctx.rev()
rightnode = ctx.node()
if path in ctx:
fctx = ctx[path]
rightlines = filelines(fctx)
if path not in parent:
leftlines = ()
else:
pfctx = parent[path]
leftlines = filelines(pfctx)
else:
rightlines = ()
pfctx = ctx.parents()[0][path]
leftlines = filelines(pfctx)
comparison = webutil.compare(web.tmpl, context, leftlines, rightlines)
if fctx is not None:
rename = webutil.renamelink(fctx)
ctx = fctx
else:
rename = []
ctx = ctx
return web.sendtemplate(
'filecomparison',
file=path,
symrev=webutil.symrevorshortnode(web.req, ctx),
rename=rename,
leftrev=leftrev,
leftnode=hex(leftnode),
rightrev=rightrev,
rightnode=hex(rightnode),
comparison=comparison,
**pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
@webcommand('annotate')
def annotate(web):
"""
/annotate/{revision}/{path}
---------------------------
Show changeset information for each line in a file.
The ``ignorews``, ``ignorewsamount``, ``ignorewseol``, and
``ignoreblanklines`` query string arguments have the same meaning as
their ``[annotate]`` config equivalents. It uses the hgrc boolean
parsing logic to interpret the value. e.g. ``0`` and ``false`` are
false and ``1`` and ``true`` are true. If not defined, the server
default settings are used.
The ``fileannotate`` template is rendered.
"""
fctx = webutil.filectx(web.repo, web.req)
f = fctx.path()
parity = paritygen(web.stripecount)
ishead = fctx.filerev() in fctx.filelog().headrevs()
# parents() is called once per line and several lines likely belong to
# same revision. So it is worth caching.
# TODO there are still redundant operations within basefilectx.parents()
# and from the fctx.annotate() call itself that could be cached.
parentscache = {}
def parents(f):
rev = f.rev()
if rev not in parentscache:
parentscache[rev] = []
for p in f.parents():
entry = {
'node': p.hex(),
'rev': p.rev(),
}
parentscache[rev].append(entry)
for p in parentscache[rev]:
yield p
def annotate(**map):
if fctx.isbinary():
mt = (mimetypes.guess_type(fctx.path())[0]
or 'application/octet-stream')
lines = [dagop.annotateline(fctx=fctx.filectx(fctx.filerev()),
lineno=1, text='(binary:%s)' % mt)]
else:
lines = webutil.annotate(web.req, fctx, web.repo.ui)
previousrev = None
blockparitygen = paritygen(1)
for lineno, aline in enumerate(lines):
f = aline.fctx
rev = f.rev()
if rev != previousrev:
blockhead = True
blockparity = next(blockparitygen)
else:
blockhead = None
previousrev = rev
yield {"parity": next(parity),
"node": f.hex(),
"rev": rev,
"author": f.user(),
"parents": parents(f),
"desc": f.description(),
"extra": f.extra(),
"file": f.path(),
"blockhead": blockhead,
"blockparity": blockparity,
"targetline": aline.lineno,
"line": aline.text,
"lineno": lineno + 1,
"lineid": "l%d" % (lineno + 1),
"linenumber": "% 6d" % (lineno + 1),
"revdate": f.date()}
diffopts = webutil.difffeatureopts(web.req, web.repo.ui, 'annotate')
diffopts = {k: getattr(diffopts, k) for k in diffopts.defaults}
return web.sendtemplate(
'fileannotate',
file=f,
annotate=annotate,
path=webutil.up(f),
symrev=webutil.symrevorshortnode(web.req, fctx),
rename=webutil.renamelink(fctx),
permissions=fctx.manifest().flags(f),
ishead=int(ishead),
diffopts=diffopts,
**pycompat.strkwargs(webutil.commonentry(web.repo, fctx)))
@webcommand('filelog')
def filelog(web):
"""
/filelog/{revision}/{path}
--------------------------
Show information about the history of a file in the repository.
The ``revcount`` query string argument can be defined to control the
maximum number of entries to show.
The ``filelog`` template will be rendered.
"""
try:
fctx = webutil.filectx(web.repo, web.req)
f = fctx.path()
fl = fctx.filelog()
except error.LookupError:
f = webutil.cleanpath(web.repo, web.req.qsparams['file'])
fl = web.repo.file(f)
numrevs = len(fl)
if not numrevs: # file doesn't exist at all
raise
rev = webutil.changectx(web.repo, web.req).rev()
first = fl.linkrev(0)
if rev < first: # current rev is from before file existed
raise
frev = numrevs - 1
while fl.linkrev(frev) > rev:
frev -= 1
fctx = web.repo.filectx(f, fl.linkrev(frev))
revcount = web.maxshortchanges
if 'revcount' in web.req.qsparams:
try:
revcount = int(web.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1)
web.tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError:
pass
lrange = webutil.linerange(web.req)
lessvars = copy.copy(web.tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(web.tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2
patch = 'patch' in web.req.qsparams
if patch:
lessvars['patch'] = morevars['patch'] = web.req.qsparams['patch']
descend = 'descend' in web.req.qsparams
if descend:
lessvars['descend'] = morevars['descend'] = web.req.qsparams['descend']
count = fctx.filerev() + 1
start = max(0, count - revcount) # first rev on this page
end = min(count, start + revcount) # last rev on this page
parity = paritygen(web.stripecount, offset=start - end)
repo = web.repo
revs = fctx.filelog().revs(start, end - 1)
entries = []
diffstyle = web.config('web', 'style')
if 'style' in web.req.qsparams:
diffstyle = web.req.qsparams['style']
def diff(fctx, linerange=None):
ctx = fctx.changectx()
basectx = ctx.p1()
path = fctx.path()
return webutil.diffs(web, ctx, basectx, [path], diffstyle,
linerange=linerange,
lineidprefix='%s-' % ctx.hex()[:12])
linerange = None
if lrange is not None:
linerange = webutil.formatlinerange(*lrange)
# deactivate numeric nav links when linerange is specified as this
# would required a dedicated "revnav" class
nav = None
if descend:
it = dagop.blockdescendants(fctx, *lrange)
else:
it = dagop.blockancestors(fctx, *lrange)
for i, (c, lr) in enumerate(it, 1):
diffs = None
if patch:
diffs = diff(c, linerange=lr)
# follow renames accross filtered (not in range) revisions
path = c.path()
entries.append(dict(
parity=next(parity),
filerev=c.rev(),
file=path,
diff=diffs,
linerange=webutil.formatlinerange(*lr),
**pycompat.strkwargs(webutil.commonentry(repo, c))))
if i == revcount:
break
lessvars['linerange'] = webutil.formatlinerange(*lrange)
morevars['linerange'] = lessvars['linerange']
else:
for i in revs:
iterfctx = fctx.filectx(i)
diffs = None
if patch:
diffs = diff(iterfctx)
entries.append(dict(
parity=next(parity),
filerev=i,
file=f,
diff=diffs,
rename=webutil.renamelink(iterfctx),
**pycompat.strkwargs(webutil.commonentry(repo, iterfctx))))
entries.reverse()
revnav = webutil.filerevnav(web.repo, fctx.path())
nav = revnav.gen(end - 1, revcount, count)
latestentry = entries[:1]
return web.sendtemplate(
'filelog',
file=f,
nav=nav,
symrev=webutil.symrevorshortnode(web.req, fctx),
entries=entries,
descend=descend,
patch=patch,
latestentry=latestentry,
linerange=linerange,
revcount=revcount,
morevars=morevars,
lessvars=lessvars,
**pycompat.strkwargs(webutil.commonentry(web.repo, fctx)))
@webcommand('archive')
def archive(web):
"""
/archive/{revision}.{format}[/{path}]
-------------------------------------
Obtain an archive of repository content.
The content and type of the archive is defined by a URL path parameter.
``format`` is the file extension of the archive type to be generated. e.g.
``zip`` or ``tar.bz2``. Not all archive types may be allowed by your
server configuration.
The optional ``path`` URL parameter controls content to include in the
archive. If omitted, every file in the specified revision is present in the
archive. If included, only the specified file or contents of the specified
directory will be included in the archive.
No template is used for this handler. Raw, binary content is generated.
"""
type_ = web.req.qsparams.get('type')
allowed = web.configlist("web", "allow_archive")
key = web.req.qsparams['node']
if type_ not in web.archivespecs:
msg = 'Unsupported archive type: %s' % type_
raise ErrorResponse(HTTP_NOT_FOUND, msg)
if not ((type_ in allowed or
web.configbool("web", "allow" + type_))):
msg = 'Archive type not allowed: %s' % type_
raise ErrorResponse(HTTP_FORBIDDEN, msg)
reponame = re.sub(br"\W+", "-", os.path.basename(web.reponame))
cnode = web.repo.lookup(key)
arch_version = key
if cnode == key or key == 'tip':
arch_version = short(cnode)
name = "%s-%s" % (reponame, arch_version)
ctx = webutil.changectx(web.repo, web.req)
pats = []
match = scmutil.match(ctx, [])
file = web.req.qsparams.get('file')
if file:
pats = ['path:' + file]
match = scmutil.match(ctx, pats, default='path')
if pats:
files = [f for f in ctx.manifest().keys() if match(f)]
if not files:
raise ErrorResponse(HTTP_NOT_FOUND,
'file(s) not found: %s' % file)
mimetype, artype, extension, encoding = web.archivespecs[type_]
web.res.headers['Content-Type'] = mimetype
web.res.headers['Content-Disposition'] = 'attachment; filename=%s%s' % (
name, extension)
if encoding:
web.res.headers['Content-Encoding'] = encoding
web.res.setbodywillwrite()
if list(web.res.sendresponse()):
raise error.ProgrammingError('sendresponse() should not emit data '
'if writing later')
bodyfh = web.res.getbodyfile()
archival.archive(web.repo, bodyfh, cnode, artype, prefix=name,
matchfn=match,
subrepos=web.configbool("web", "archivesubrepos"))
return []
@webcommand('static')
def static(web):
fname = web.req.qsparams['file']
# a repo owner may set web.static in .hg/hgrc to get any file
# readable by the user running the CGI script
static = web.config("web", "static", None, untrusted=False)
if not static:
tp = web.templatepath or templater.templatepaths()
if isinstance(tp, str):
tp = [tp]
static = [os.path.join(p, 'static') for p in tp]
staticfile(static, fname, web.res)
return web.res.sendresponse()
@webcommand('graph')
def graph(web):
"""
/graph[/{revision}]
-------------------
Show information about the graphical topology of the repository.
Information rendered by this handler can be used to create visual
representations of repository topology.
The ``revision`` URL parameter controls the starting changeset. If it's
absent, the default is ``tip``.
The ``revcount`` query string argument can define the number of changesets
to show information for.
The ``graphtop`` query string argument can specify the starting changeset
for producing ``jsdata`` variable that is used for rendering graph in
JavaScript. By default it has the same value as ``revision``.
This handler will render the ``graph`` template.
"""
if 'node' in web.req.qsparams:
ctx = webutil.changectx(web.repo, web.req)
symrev = webutil.symrevorshortnode(web.req, ctx)
else:
ctx = web.repo['tip']
symrev = 'tip'
rev = ctx.rev()
bg_height = 39
revcount = web.maxshortchanges
if 'revcount' in web.req.qsparams:
try:
revcount = int(web.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1)
web.tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError:
pass
lessvars = copy.copy(web.tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(web.tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2
graphtop = web.req.qsparams.get('graphtop', ctx.hex())
graphvars = copy.copy(web.tmpl.defaults['sessionvars'])
graphvars['graphtop'] = graphtop
count = len(web.repo)
pos = rev
uprev = min(max(0, count - 1), rev + revcount)
downrev = max(0, rev - revcount)
changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
tree = []
nextentry = []
lastrev = 0
if pos != -1:
allrevs = web.repo.changelog.revs(pos, 0)
revs = []
for i in allrevs:
revs.append(i)
if len(revs) >= revcount + 1:
break
if len(revs) > revcount:
nextentry = [webutil.commonentry(web.repo, web.repo[revs[-1]])]
revs = revs[:-1]
lastrev = revs[-1]
# We have to feed a baseset to dagwalker as it is expecting smartset
# object. This does not have a big impact on hgweb performance itself
# since hgweb graphing code is not itself lazy yet.
dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
# As we said one line above... not lazy.
tree = list(item for item in graphmod.colored(dag, web.repo)
if item[1] == graphmod.CHANGESET)
def nodecurrent(ctx):
wpnodes = web.repo.dirstate.parents()
if wpnodes[1] == nullid:
wpnodes = wpnodes[:1]
if ctx.node() in wpnodes:
return '@'
return ''
def nodesymbol(ctx):
if ctx.obsolete():
return 'x'
elif ctx.isunstable():
return '*'
elif ctx.closesbranch():
return '_'
else:
return 'o'
def fulltree():
pos = web.repo[graphtop].rev()
tree = []
if pos != -1:
revs = web.repo.changelog.revs(pos, lastrev)
dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
tree = list(item for item in graphmod.colored(dag, web.repo)
if item[1] == graphmod.CHANGESET)
return tree
def jsdata():
return [{'node': pycompat.bytestr(ctx),
'graphnode': nodecurrent(ctx) + nodesymbol(ctx),
'vertex': vtx,
'edges': edges}
for (id, type, ctx, vtx, edges) in fulltree()]
def nodes():
parity = paritygen(web.stripecount)
for row, (id, type, ctx, vtx, edges) in enumerate(tree):
entry = webutil.commonentry(web.repo, ctx)
edgedata = [{'col': edge[0],
'nextcol': edge[1],
'color': (edge[2] - 1) % 6 + 1,
'width': edge[3],
'bcolor': edge[4]}
for edge in edges]
entry.update({'col': vtx[0],
'color': (vtx[1] - 1) % 6 + 1,
'parity': next(parity),
'edges': edgedata,
'row': row,
'nextrow': row + 1})
yield entry
rows = len(tree)
return web.sendtemplate(
'graph',
rev=rev,
symrev=symrev,
revcount=revcount,
uprev=uprev,
lessvars=lessvars,
morevars=morevars,
downrev=downrev,
graphvars=graphvars,
rows=rows,
bg_height=bg_height,
changesets=count,
nextentry=nextentry,
jsdata=lambda **x: jsdata(),
nodes=lambda **x: nodes(),
node=ctx.hex(),
changenav=changenav)
def _getdoc(e):
doc = e[0].__doc__
if doc:
doc = _(doc).partition('\n')[0]
else:
doc = _('(no help text available)')
return doc
@webcommand('help')
def help(web):
"""
/help[/{topic}]
---------------
Render help documentation.
This web command is roughly equivalent to :hg:`help`. If a ``topic``
is defined, that help topic will be rendered. If not, an index of
available help topics will be rendered.
The ``help`` template will be rendered when requesting help for a topic.
``helptopics`` will be rendered for the index of help topics.
"""
from .. import commands, help as helpmod # avoid cycle
topicname = web.req.qsparams.get('node')
if not topicname:
def topics(**map):
for entries, summary, _doc in helpmod.helptable:
yield {'topic': entries[0], 'summary': summary}
early, other = [], []
primary = lambda s: s.partition('|')[0]
for c, e in commands.table.iteritems():
doc = _getdoc(e)
if 'DEPRECATED' in doc or c.startswith('debug'):
continue
cmd = primary(c)
if cmd.startswith('^'):
early.append((cmd[1:], doc))
else:
other.append((cmd, doc))
early.sort()
other.sort()
def earlycommands(**map):
for c, doc in early:
yield {'topic': c, 'summary': doc}
def othercommands(**map):
for c, doc in other:
yield {'topic': c, 'summary': doc}
return web.sendtemplate(
'helptopics',
topics=topics,
earlycommands=earlycommands,
othercommands=othercommands,
title='Index')
# Render an index of sub-topics.
if topicname in helpmod.subtopics:
topics = []
for entries, summary, _doc in helpmod.subtopics[topicname]:
topics.append({
'topic': '%s.%s' % (topicname, entries[0]),
'basename': entries[0],
'summary': summary,
})
return web.sendtemplate(
'helptopics',
topics=topics,
title=topicname,
subindex=True)
u = webutil.wsgiui.load()
u.verbose = True
# Render a page from a sub-topic.
if '.' in topicname:
# TODO implement support for rendering sections, like
# `hg help` works.
topic, subtopic = topicname.split('.', 1)
if topic not in helpmod.subtopics:
raise ErrorResponse(HTTP_NOT_FOUND)
else:
topic = topicname
subtopic = None
try:
doc = helpmod.help_(u, commands, topic, subtopic=subtopic)
except error.Abort:
raise ErrorResponse(HTTP_NOT_FOUND)
return web.sendtemplate(
'help',
topic=topicname,
doc=doc)
# tell hggettext to extract docstrings from these functions:
i18nfunctions = commands.values()