mercurial-scm/hg: mercurial/hgweb/webcommands.py annotate

annotate mercurial/hgweb/webcommands.py @ 36883:061635d4221c

hgweb: add a sendtemplate() helper function This pattern is common. Let's make a helper function to reduce boilerplate. We store the "global" template on the requestcontext instance and use it. The templater used by the helper function is the same templater that's passed in as an argument to the @webcommand functions. It needs to be this way because various commands are accessing and mutating the defaults on the templater instance. Differential Revision: https://phab.mercurial-scm.org/D2799

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Sat, 10 Mar 2018 19:41:18 -0800
parents	66f62d120ba2
children	ece242db5000

rev	line source
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1 #
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	2 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9404 diff changeset	6 # GNU General Public License version 2 or any later version.
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	7
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	8 from __future__ import absolute_import
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	9
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	10 import copy
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	11 import mimetypes
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	12 import os
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	13 import re
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	14
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	15 from ..i18n import _
35566 baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	16 from ..node import hex, nullid, short
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	17
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	18 from .common import (
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	19 ErrorResponse,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	20 HTTP_FORBIDDEN,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	21 HTTP_NOT_FOUND,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	22 get_contact,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	23 paritygen,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	24 staticfile,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	25 )
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	26
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	27 from .. import (
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	28 archival,
32904 582080a4a812 dagop: move blockancestors() and blockdescendants() from context Yuya Nishihara <yuya@tcha.org> parents: 32566 diff changeset	29 dagop,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	30 encoding,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	31 error,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	32 graphmod,
34809 3a65012be661 webcommands: replace str(ctx) etc with pycompat.bytestr(ctx) etc Augie Fackler <augie@google.com> parents: 34695 diff changeset	33 pycompat,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	34 revset,
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 31023 diff changeset	35 revsetlang,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	36 scmutil,
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30826 diff changeset	37 smartset,
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	38 templater,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	39 util,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	40 )
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	41
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	42 from . import (
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	43 webutil,
37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	44 )
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	45
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	46 __all__ = []
24077 e8046ca0405d webcommands: define a dict of available commands Gregory Szorc <gregory.szorc@gmail.com> parents: 24076 diff changeset	47 commands = {}
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	48
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	49 class webcommand(object):
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	50 """Decorator used to register a web command handler.
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	51
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	52 The decorator takes as its positional arguments the name/path the
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	53 command should be accessible under.
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	54
36870 1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	55 When called, functions receive as arguments a ``requestcontext``,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	56 ``wsgirequest``, and a templater instance for generatoring output.
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	57 The functions should populate the ``rctx.res`` object with details
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	58 about the HTTP response.
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	59
36880 67fb0dca29bc hgweb: always return iterable from @webcommand functions (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36876 diff changeset	60 The function returns a generator to be consumed by the WSGI application.
67fb0dca29bc hgweb: always return iterable from @webcommand functions (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36876 diff changeset	61 For most commands, this should be the result from
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	62 ``web.res.sendresponse()``. Many commands will call ``web.sendtemplate()``
061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	63 to render a template.
36870 1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	64
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	65 Usage:
5963 5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	66
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	67 @webcommand('mycommand')
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	68 def mycommand(web, req, tmpl):
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	69 pass
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	70 """
5963 5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	71
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	72 def __init__(self, name):
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	73 self.name = name
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	74
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	75 def __call__(self, func):
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	76 __all__.append(self.name)
24077 e8046ca0405d webcommands: define a dict of available commands Gregory Szorc <gregory.szorc@gmail.com> parents: 24076 diff changeset	77 commands[self.name] = func
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	78 return func
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	79
b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	80 @webcommand('log')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	81 def log(web, req, tmpl):
24087 6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	82 """
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	83 /log[/{revision}[/{path}]]
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	84 --------------------------
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	85
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	86 Show repository or file history.
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	87
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	88 For URLs of the form ``/log/{revision}``, a list of changesets starting at
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	89 the specified changeset identifier is shown. If ``{revision}`` is not
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	90 defined, the default is ``tip``. This form is equivalent to the
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	91 ``changelog`` handler.
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	92
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	93 For URLs of the form ``/log/{revision}/{file}``, the history for a specific
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	94 file will be shown. This form is equivalent to the ``filelog`` handler.
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	95 """
6f5b4393590c webcommands: document "log" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24086 diff changeset	96
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	97 if web.req.qsparams.get('file'):
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	98 return filelog(web, req, tmpl)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	99 else:
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	100 return changelog(web, req, tmpl)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	101
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	102 @webcommand('rawfile')
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	103 def rawfile(web, req, tmpl):
34608 f12de15c5711 configitems: register the 'web.guessmime' config Boris Feld <boris.feld@octobus.net> parents: 34432 diff changeset	104 guessmime = web.configbool('web', 'guessmime')
15004 d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	105
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	106 path = webutil.cleanpath(web.repo, web.req.qsparams.get('file', ''))
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	107 if not path:
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	108 return manifest(web, req, tmpl)
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	109
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	110 try:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	111 fctx = webutil.filectx(web.repo, req)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25602 diff changeset	112 except error.LookupError as inst:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	113 try:
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	114 return manifest(web, req, tmpl)
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	115 except ErrorResponse:
2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	116 raise inst
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	117
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	118 path = fctx.path()
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	119 text = fctx.data()
15004 d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	120 mt = 'application/binary'
d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	121 if guessmime:
d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	122 mt = mimetypes.guess_type(path)[0]
d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	123 if mt is None:
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	124 if util.binary(text):
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	125 mt = 'application/binary'
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	126 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	127 mt = 'text/plain'
11332 716e176a4e01 hgweb: specify a charset when sending raw text files Julian Cowley <julian@lava.net> parents: 10394 diff changeset	128 if mt.startswith('text/'):
716e176a4e01 hgweb: specify a charset when sending raw text files Julian Cowley <julian@lava.net> parents: 10394 diff changeset	129 mt += '; charset="%s"' % encoding.encoding
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	130
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	131 web.res.headers['Content-Type'] = mt
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	132 filename = (path.rpartition('/')[-1]
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	133 .replace('\\', '\\\\').replace('"', '\\"'))
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	134 web.res.headers['Content-Disposition'] = 'inline; filename="%s"' % filename
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	135 web.res.setbodybytes(text)
36880 67fb0dca29bc hgweb: always return iterable from @webcommand functions (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36876 diff changeset	136 return web.res.sendresponse()
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	137
25602 85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	138 def _filerevision(web, req, tmpl, fctx):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	139 f = fctx.path()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	140 text = fctx.data()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	141 parity = paritygen(web.stripecount)
32070 a298f5c61b34 hgweb: do not show "descending" link in followlines UI for filelog heads Denis Laxalde <denis.laxalde@logilab.fr> parents: 31939 diff changeset	142 ishead = fctx.filerev() in fctx.filelog().headrevs()
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	143
19657 145636d31bb4 hgweb: import the whole util module in webcommands instead of just one function Alexander Plavin <alexander@plav.in> parents: 19656 diff changeset	144 if util.binary(text):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	145 mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	146 text = '(binary:%s)' % mt
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	147
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	148 def lines():
9136 31177742f54a for calls expecting bool args, pass bool instead of int Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8842 diff changeset	149 for lineno, t in enumerate(text.splitlines(True)):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	150 yield {"line": t,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	151 "lineid": "l%d" % (lineno + 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	152 "linenumber": "% 6d" % (lineno + 1),
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	153 "parity": next(parity)}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	154
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	155 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	156 'filerevision',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	157 file=f,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	158 path=webutil.up(f),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	159 text=lines(),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	160 symrev=webutil.symrevorshortnode(req, fctx),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	161 rename=webutil.renamelink(fctx),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	162 permissions=fctx.manifest().flags(f),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	163 ishead=int(ishead),
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	164 **pycompat.strkwargs(webutil.commonentry(web.repo, fctx)))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	165
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	166 @webcommand('file')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	167 def file(web, req, tmpl):
24088 fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	168 """
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	169 /file/{revision}[/{path}]
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	170 -------------------------
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	171
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	172 Show information about a directory or file in the repository.
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	173
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	174 Info about the ``path`` given as a URL parameter will be rendered.
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	175
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	176 If ``path`` is a directory, information about the entries in that
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	177 directory will be rendered. This form is equivalent to the ``manifest``
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	178 handler.
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	179
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	180 If ``path`` is a file, information about that file will be shown via
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	181 the ``filerevision`` template.
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	182
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	183 If ``path`` is not defined, information about the root directory will
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	184 be rendered.
fe3ee31b039f webcommands: document "file" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24087 diff changeset	185 """
36872 89002d07a114 hgweb: remove one-off routing for file?style=raw Gregory Szorc <gregory.szorc@gmail.com> parents: 36871 diff changeset	186 if web.req.qsparams.get('style') == 'raw':
89002d07a114 hgweb: remove one-off routing for file?style=raw Gregory Szorc <gregory.szorc@gmail.com> parents: 36871 diff changeset	187 return rawfile(web, req, tmpl)
89002d07a114 hgweb: remove one-off routing for file?style=raw Gregory Szorc <gregory.szorc@gmail.com> parents: 36871 diff changeset	188
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	189 path = webutil.cleanpath(web.repo, web.req.qsparams.get('file', ''))
6853 2ff0829bdae5 hgweb: do not use unassigned variables in exception handling Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6669 diff changeset	190 if not path:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	191 return manifest(web, req, tmpl)
6853 2ff0829bdae5 hgweb: do not use unassigned variables in exception handling Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6669 diff changeset	192 try:
25602 85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	193 return _filerevision(web, req, tmpl, webutil.filectx(web.repo, req))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25602 diff changeset	194 except error.LookupError as inst:
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	195 try:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	196 return manifest(web, req, tmpl)
6853 2ff0829bdae5 hgweb: do not use unassigned variables in exception handling Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6669 diff changeset	197 except ErrorResponse:
2ff0829bdae5 hgweb: do not use unassigned variables in exception handling Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6669 diff changeset	198 raise inst
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	199
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	200 def _search(web, tmpl):
19656 60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	201 MODE_REVISION = 'rev'
60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	202 MODE_KEYWORD = 'keyword'
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	203 MODE_REVSET = 'revset'
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	204
19633 217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	205 def revsearch(ctx):
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	206 yield ctx
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	207
19632 299511aabf85 hgweb: pass arguments which a function depends on explicitly in search Alexander Plavin <alexander@plav.in> parents: 19631 diff changeset	208 def keywordsearch(query):
15727 917f263eeb26 i18n: use "encoding.lower()" to normalize string in hgweb search query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15528 diff changeset	209 lower = encoding.lower
917f263eeb26 i18n: use "encoding.lower()" to normalize string in hgweb search query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15528 diff changeset	210 qw = lower(query).split()
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	211
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	212 def revgen():
18497 a58d8936647a hgweb: prevent traceback during search when filtered (issue3783) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18478 diff changeset	213 cl = web.repo.changelog
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	214 for i in xrange(len(web.repo) - 1, 0, -100):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	215 l = []
19491 e111d5e6bbbd hgweb: fix duplication for some search queries Alexander Plavin <me@aplavin.ru> parents: 19487 diff changeset	216 for j in cl.revs(max(0, i - 99), i):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	217 ctx = web.repo[j]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	218 l.append(ctx)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	219 l.reverse()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	220 for e in l:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	221 yield e
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	222
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	223 for ctx in revgen():
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	224 miss = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	225 for q in qw:
15727 917f263eeb26 i18n: use "encoding.lower()" to normalize string in hgweb search query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15528 diff changeset	226 if not (q in lower(ctx.user()) or
917f263eeb26 i18n: use "encoding.lower()" to normalize string in hgweb search query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15528 diff changeset	227 q in lower(ctx.description()) or
917f263eeb26 i18n: use "encoding.lower()" to normalize string in hgweb search query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15528 diff changeset	228 q in lower(" ".join(ctx.files()))):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	229 miss = 1
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	230 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	231 if miss:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	232 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	233
19533 9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	234 yield ctx
9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	235
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	236 def revsetsearch(revs):
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	237 for r in revs:
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	238 yield web.repo[r]
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	239
19631 cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	240 searchfuncs = {
20004 06e118c097ff hgweb, i18n: do not translate search mode description Wagner Bruna <wbruna@softwareexpress.com.br> parents: 19951 diff changeset	241 MODE_REVISION: (revsearch, 'exact revision search'),
06e118c097ff hgweb, i18n: do not translate search mode description Wagner Bruna <wbruna@softwareexpress.com.br> parents: 19951 diff changeset	242 MODE_KEYWORD: (keywordsearch, 'literal keyword search'),
06e118c097ff hgweb, i18n: do not translate search mode description Wagner Bruna <wbruna@softwareexpress.com.br> parents: 19951 diff changeset	243 MODE_REVSET: (revsetsearch, 'revset expression search'),
19631 cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	244 }
cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	245
19632 299511aabf85 hgweb: pass arguments which a function depends on explicitly in search Alexander Plavin <alexander@plav.in> parents: 19631 diff changeset	246 def getsearchmode(query):
19633 217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	247 try:
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	248 ctx = web.repo[query]
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	249 except (error.RepoError, error.LookupError):
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	250 # query is not an exact revision pointer, need to
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19886 diff changeset	251 # decide if it's a revset expression or keywords
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	252 pass
19633 217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	253 else:
19656 60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	254 return MODE_REVISION, ctx
19631 cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	255
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	256 revdef = 'reverse(%s)' % query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	257 try:
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 31023 diff changeset	258 tree = revsetlang.parse(revdef)
27009 f5faef7e9119 hgweb: unify import style of error classes Yuya Nishihara <yuya@tcha.org> parents: 26894 diff changeset	259 except error.ParseError:
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	260 # can't parse to a revset tree
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	261 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	262
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 31023 diff changeset	263 if revsetlang.depth(tree) <= 2:
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	264 # no revset syntax used
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	265 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	266
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 25136 diff changeset	267 if any((token, (value or '')[:3]) == ('string', 're:')
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 31023 diff changeset	268 for token, value, pos in revsetlang.tokenize(revdef)):
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	269 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	270
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 31023 diff changeset	271 funcsused = revsetlang.funcsused(tree)
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	272 if not funcsused.issubset(revset.safesymbols):
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	273 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	274
33554 2943141f5e07 revset: pass repo when passing ui Gregory Szorc <gregory.szorc@gmail.com> parents: 32996 diff changeset	275 mfunc = revset.match(web.repo.ui, revdef, repo=web.repo)
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	276 try:
24114 fafd9a1284cf revset: make match function initiate query from full set by default Yuya Nishihara <yuya@tcha.org> parents: 24097 diff changeset	277 revs = mfunc(web.repo)
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	278 return MODE_REVSET, revs
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	279 # ParseError: wrongly placed tokens, wrongs arguments, etc
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	280 # RepoLookupError: no such revision, e.g. in 'revision:'
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	281 # Abort: bookmark/tag not exists
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	282 # LookupError: ambiguous identifier, e.g. in '(bc)' on a large repo
27009 f5faef7e9119 hgweb: unify import style of error classes Yuya Nishihara <yuya@tcha.org> parents: 26894 diff changeset	283 except (error.ParseError, error.RepoLookupError, error.Abort,
f5faef7e9119 hgweb: unify import style of error classes Yuya Nishihara <yuya@tcha.org> parents: 26894 diff changeset	284 LookupError):
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	285 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	286
19533 9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	287 def changelist(**map):
9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	288 count = 0
9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	289
19765 521c373ff134 hgweb: pass variable with current search mode name to the search template Alexander Plavin <alexander@plav.in> parents: 19738 diff changeset	290 for ctx in searchfunc[0](funcarg):
6659 bc553c6d1ef9 webcommands: fix increments lost by 894875eae49b Andrew Beekhof <beekhof@gmail.com> parents: 6657 diff changeset	291 count += 1
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	292 n = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	293 showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
7311 de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	294 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	295
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	296 yield tmpl('searchentry',
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	297 parity=next(parity),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	298 changelogtag=showtags,
7311 de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	299 files=files,
36434 1fb9e01328e4 py3: use pycompat.strkwargs to convert kwargs keys to str Pulkit Goyal <7895pulkit@gmail.com> parents: 36384 diff changeset	300 **pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	301
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	302 if count >= revcount:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	303 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	304
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	305 query = web.req.qsparams['rev']
19418 55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	306 revcount = web.maxchanges
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	307 if 'revcount' in web.req.qsparams:
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	308 try:
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	309 revcount = int(web.req.qsparams.get('revcount', revcount))
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	310 revcount = max(revcount, 1)
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	311 tmpl.defaults['sessionvars']['revcount'] = revcount
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	312 except ValueError:
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	313 pass
19418 55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	314
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	315 lessvars = copy.copy(tmpl.defaults['sessionvars'])
36553 24897a9d18ac webcommands: use explicit integer division for Python 3 compat Augie Fackler <augie@google.com> parents: 36434 diff changeset	316 lessvars['revcount'] = max(revcount // 2, 1)
19418 55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	317 lessvars['rev'] = query
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	318 morevars = copy.copy(tmpl.defaults['sessionvars'])
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	319 morevars['revcount'] = revcount * 2
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	320 morevars['rev'] = query
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	321
19632 299511aabf85 hgweb: pass arguments which a function depends on explicitly in search Alexander Plavin <alexander@plav.in> parents: 19631 diff changeset	322 mode, funcarg = getsearchmode(query)
19768 186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	323
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	324 if 'forcekw' in web.req.qsparams:
19768 186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	325 showforcekw = ''
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	326 showunforcekw = searchfuncs[mode][1]
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	327 mode = MODE_KEYWORD
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	328 funcarg = query
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	329 else:
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	330 if mode != MODE_KEYWORD:
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	331 showforcekw = searchfuncs[MODE_KEYWORD][1]
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	332 else:
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	333 showforcekw = ''
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	334 showunforcekw = ''
186f54d40fdd hgweb: add link to force literal keyword search Alexander Plavin <alexander@plav.in> parents: 19765 diff changeset	335
19631 cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	336 searchfunc = searchfuncs[mode]
cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	337
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	338 tip = web.repo['tip']
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	339 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	340
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	341 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	342 'search',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	343 query=query,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	344 node=tip.hex(),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	345 symrev='tip',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	346 entries=changelist,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	347 archives=web.archivelist('tip'),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	348 morevars=morevars,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	349 lessvars=lessvars,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	350 modedesc=searchfunc[1],
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	351 showforcekw=showforcekw,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	352 showunforcekw=showunforcekw)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	353
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	354 @webcommand('changelog')
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	355 def changelog(web, req, tmpl, shortlog=False):
24089 f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	356 """
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	357 /changelog[/{revision}]
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	358 -----------------------
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	359
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	360 Show information about multiple changesets.
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	361
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	362 If the optional ``revision`` URL argument is absent, information about
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	363 all changesets starting at ``tip`` will be rendered. If the ``revision``
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	364 argument is present, changesets will be shown starting from the specified
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	365 revision.
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	366
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	367 If ``revision`` is absent, the ``rev`` query string argument may be
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	368 defined. This will perform a search for changesets.
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	369
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	370 The argument for ``rev`` can be a single revision, a revision set,
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	371 or a literal keyword to search for in changeset data (equivalent to
24867 6d97ca3f05ba webcommands: fix typo in changelog documentation Wagner Bruna <wbruna@softwareexpress.com.br> parents: 24859 diff changeset	372 :hg:`log -k`).
24089 f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	373
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	374 The ``revcount`` query string argument defines the maximum numbers of
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	375 changesets to render.
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	376
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	377 For non-searches, the ``changelog`` template will be rendered.
f17773432782 webcommands: document "changelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24088 diff changeset	378 """
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	379
19396 afc23eddc324 hgweb: show current search query in the input field Alexander Plavin <me@aplavin.ru> parents: 18968 diff changeset	380 query = ''
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	381 if 'node' in web.req.qsparams:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	382 ctx = webutil.changectx(web.repo, req)
25602 85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	383 symrev = webutil.symrevorshortnode(req, ctx)
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	384 elif 'rev' in web.req.qsparams:
66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	385 return _search(web, tmpl)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	386 else:
19534 983bb4069004 hgweb: cleaner if conditions in changelog() function Alexander Plavin <alexander@plav.in> parents: 19533 diff changeset	387 ctx = web.repo['tip']
25602 85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	388 symrev = 'tip'
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	389
19737 ab5442f45441 hgweb: always compute all entries and latestentry in changelog Alexander Plavin <alexander@plav.in> parents: 19735 diff changeset	390 def changelist():
18427 56ca4443a343 hgweb: use changelog for iteration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18409 diff changeset	391 revs = []
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	392 if pos != -1:
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	393 revs = web.repo.changelog.revs(pos, 0)
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	394 curcount = 0
23745 513d47905114 hgweb: extract changelist entry generation into own function Gregory Szorc <gregory.szorc@gmail.com> parents: 23740 diff changeset	395 for rev in revs:
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	396 curcount += 1
19738 93b8544c4482 hgweb: add nextentry variable for easy pagination in changelog Alexander Plavin <alexander@plav.in> parents: 19737 diff changeset	397 if curcount > revcount + 1:
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	398 break
23745 513d47905114 hgweb: extract changelist entry generation into own function Gregory Szorc <gregory.szorc@gmail.com> parents: 23740 diff changeset	399
513d47905114 hgweb: extract changelist entry generation into own function Gregory Szorc <gregory.szorc@gmail.com> parents: 23740 diff changeset	400 entry = webutil.changelistentry(web, web.repo[rev], tmpl)
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	401 entry['parity'] = next(parity)
23745 513d47905114 hgweb: extract changelist entry generation into own function Gregory Szorc <gregory.szorc@gmail.com> parents: 23740 diff changeset	402 yield entry
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	403
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	404 if shortlog:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	405 revcount = web.maxshortchanges
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	406 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	407 revcount = web.maxchanges
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	408
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	409 if 'revcount' in web.req.qsparams:
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	410 try:
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	411 revcount = int(web.req.qsparams.get('revcount', revcount))
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	412 revcount = max(revcount, 1)
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	413 tmpl.defaults['sessionvars']['revcount'] = revcount
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	414 except ValueError:
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	415 pass
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	416
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	417 lessvars = copy.copy(tmpl.defaults['sessionvars'])
36553 24897a9d18ac webcommands: use explicit integer division for Python 3 compat Augie Fackler <augie@google.com> parents: 36434 diff changeset	418 lessvars['revcount'] = max(revcount // 2, 1)
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	419 morevars = copy.copy(tmpl.defaults['sessionvars'])
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	420 morevars['revcount'] = revcount * 2
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	421
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	422 count = len(web.repo)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	423 pos = ctx.rev()
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	424 parity = paritygen(web.stripecount)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	425
18409 e3f5cef11d6a hgweb: pass repo object to revnav construction Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18408 diff changeset	426 changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	427
19737 ab5442f45441 hgweb: always compute all entries and latestentry in changelog Alexander Plavin <alexander@plav.in> parents: 19735 diff changeset	428 entries = list(changelist())
ab5442f45441 hgweb: always compute all entries and latestentry in changelog Alexander Plavin <alexander@plav.in> parents: 19735 diff changeset	429 latestentry = entries[:1]
19738 93b8544c4482 hgweb: add nextentry variable for easy pagination in changelog Alexander Plavin <alexander@plav.in> parents: 19737 diff changeset	430 if len(entries) > revcount:
93b8544c4482 hgweb: add nextentry variable for easy pagination in changelog Alexander Plavin <alexander@plav.in> parents: 19737 diff changeset	431 nextentry = entries[-1:]
93b8544c4482 hgweb: add nextentry variable for easy pagination in changelog Alexander Plavin <alexander@plav.in> parents: 19737 diff changeset	432 entries = entries[:-1]
93b8544c4482 hgweb: add nextentry variable for easy pagination in changelog Alexander Plavin <alexander@plav.in> parents: 19737 diff changeset	433 else:
93b8544c4482 hgweb: add nextentry variable for easy pagination in changelog Alexander Plavin <alexander@plav.in> parents: 19737 diff changeset	434 nextentry = []
19737 ab5442f45441 hgweb: always compute all entries and latestentry in changelog Alexander Plavin <alexander@plav.in> parents: 19735 diff changeset	435
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	436 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	437 'shortlog' if shortlog else 'changelog',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	438 changenav=changenav,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	439 node=ctx.hex(),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	440 rev=pos,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	441 symrev=symrev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	442 changesets=count,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	443 entries=entries,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	444 latestentry=latestentry,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	445 nextentry=nextentry,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	446 archives=web.archivelist('tip'),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	447 revcount=revcount,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	448 morevars=morevars,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	449 lessvars=lessvars,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	450 query=query)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	451
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	452 @webcommand('shortlog')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	453 def shortlog(web, req, tmpl):
24086 2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	454 """
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	455 /shortlog
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	456 ---------
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	457
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	458 Show basic information about a set of changesets.
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	459
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	460 This accepts the same parameters as the ``changelog`` handler. The only
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	461 difference is the ``shortlog`` template will be rendered instead of the
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	462 ``changelog`` template.
2d8e93554822 webcommands: document "shortlog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24085 diff changeset	463 """
19872 681f7b9213a4 check-code: check for spaces around = for named parameters Mads Kiilerich <madski@unity3d.com> parents: 19768 diff changeset	464 return changelog(web, req, tmpl, shortlog=True)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	465
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	466 @webcommand('changeset')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	467 def changeset(web, req, tmpl):
24085 0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	468 """
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	469 /changeset[/{revision}]
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	470 -----------------------
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	471
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	472 Show information about a single changeset.
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	473
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	474 A URL path argument is the changeset identifier to show. See ``hg help
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	475 revisions`` for possible values. If not defined, the ``tip`` changeset
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	476 will be shown.
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	477
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	478 The ``changeset`` template is rendered. Contents of the ``changesettag``,
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	479 ``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	480 templates related to diffs may all be used to produce the output.
0bf61eae67ab webcommands: document "changeset" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24084 diff changeset	481 """
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	482 ctx = webutil.changectx(web.repo, req)
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	483
061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	484 return web.sendtemplate(
061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	485 'changeset',
061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	486 **webutil.changesetentry(web, req, tmpl, ctx))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	487
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	488 rev = webcommand('rev')(changeset)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	489
16448 e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	490 def decodepath(path):
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	491 """Hook for mapping a path in the repository to a path in the
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	492 working copy.
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	493
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	494 Extensions (e.g., largefiles) can override this to remap files in
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	495 the virtual file system presented by the manifest command below."""
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	496 return path
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	497
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	498 @webcommand('manifest')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	499 def manifest(web, req, tmpl):
24090 a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	500 """
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	501 /manifest[/{revision}[/{path}]]
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	502 -------------------------------
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	503
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	504 Show information about a directory.
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	505
24868 9668c653eb9d webcommands: fix description of manifest default behavior Wagner Bruna <wbruna@softwareexpress.com.br> parents: 24867 diff changeset	506 If the URL path arguments are omitted, information about the root
24090 a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	507 directory for the ``tip`` changeset will be shown.
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	508
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	509 Because this handler can only show information for directories, it
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	510 is recommended to use the ``file`` handler instead, as it can handle both
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	511 directories and files.
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	512
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	513 The ``manifest`` template will be rendered for this handler.
a86b2922ea30 webcommands: document "manifest" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24089 diff changeset	514 """
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	515 if 'node' in web.req.qsparams:
25602 85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	516 ctx = webutil.changectx(web.repo, req)
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	517 symrev = webutil.symrevorshortnode(req, ctx)
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	518 else:
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	519 ctx = web.repo['tip']
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	520 symrev = 'tip'
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	521 path = webutil.cleanpath(web.repo, web.req.qsparams.get('file', ''))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	522 mf = ctx.manifest()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	523 node = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	524
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	525 files = {}
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	526 dirs = {}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	527 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	528
36714 250f3168d907 hgweb: fix up trailing slash detection on Python 3 Augie Fackler <augie@google.com> parents: 36553 diff changeset	529 if path and path[-1:] != "/":
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	530 path += "/"
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	531 l = len(path)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	532 abspath = "/" + path
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	533
16448 e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	534 for full, n in mf.iteritems():
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	535 # the virtual path (working copy path) used for the full
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	536 # (repository) path
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	537 f = decodepath(full)
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	538
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	539 if f[:l] != path:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	540 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	541 remain = f[l:]
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	542 elements = remain.split('/')
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	543 if len(elements) == 1:
16448 e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	544 files[remain] = full
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	545 else:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	546 h = dirs # need to retain ref to dirs (root)
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	547 for elem in elements[0:-1]:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	548 if elem not in h:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	549 h[elem] = {}
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	550 h = h[elem]
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	551 if len(h) > 1:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	552 break
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	553 h[None] = None # denotes files present
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	554
7565 5f162f61e479 hgweb: fix problems with empty repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7434 diff changeset	555 if mf and not files and not dirs:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	556 raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	557
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	558 def filelist(**map):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7966 diff changeset	559 for f in sorted(files):
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	560 full = files[f]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	561
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	562 fctx = ctx.filectx(full)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	563 yield {"file": full,
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	564 "parity": next(parity),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	565 "basename": f,
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	566 "date": fctx.date(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	567 "size": fctx.size(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	568 "permissions": mf.flags(full)}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	569
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	570 def dirlist(**map):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7966 diff changeset	571 for d in sorted(dirs):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	572
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	573 emptydirs = []
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	574 h = dirs[d]
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	575 while isinstance(h, dict) and len(h) == 1:
36274 a748a5d1d7c3 webcommands: unpack contents of length-1 dict portably Augie Fackler <augie@google.com> parents: 36248 diff changeset	576 k, v = next(iter(h.items()))
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	577 if v:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	578 emptydirs.append(k)
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	579 h = v
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	580
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	581 path = "%s%s" % (abspath, d)
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	582 yield {"parity": next(parity),
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	583 "path": path,
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	584 "emptydirs": "/".join(emptydirs),
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	585 "basename": d}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	586
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	587 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	588 'manifest',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	589 symrev=symrev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	590 path=abspath,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	591 up=webutil.up(abspath),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	592 upparity=next(parity),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	593 fentries=filelist,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	594 dentries=dirlist,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	595 archives=web.archivelist(hex(node)),
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	596 **pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	597
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	598 @webcommand('tags')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	599 def tags(web, req, tmpl):
24084 ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	600 """
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	601 /tags
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	602 -----
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	603
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	604 Show information about tags.
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	605
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	606 No arguments are accepted.
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	607
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	608 The ``tags`` template is rendered.
ef06e2b1a3d1 webcommands: document "tags" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24083 diff changeset	609 """
18029 109a6a9dcca8 hgweb: fix iterator reuse in atom feed generation Matt Mackall <mpm@selenic.com> parents: 17322 diff changeset	610 i = list(reversed(web.repo.tagslist()))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	611 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	612
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	613 def entries(notip, latestonly, **map):
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	614 t = i
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	615 if notip:
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	616 t = [(k, n) for k, n in i if k != "tip"]
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	617 if latestonly:
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	618 t = t[:1]
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	619 for k, n in t:
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	620 yield {"parity": next(parity),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	621 "tag": k,
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	622 "date": web.repo[n].date(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	623 "node": hex(n)}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	624
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	625 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	626 'tags',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	627 node=hex(web.repo.changelog.tip()),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	628 entries=lambda x: entries(False, False, x),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	629 entriesnotip=lambda x: entries(True, False, x),
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	630 latestentry=lambda x: entries(True, True, x))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	631
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	632 @webcommand('bookmarks')
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	633 def bookmarks(web, req, tmpl):
24083 5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	634 """
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	635 /bookmarks
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	636 ----------
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	637
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	638 Show information about bookmarks.
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	639
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	640 No arguments are accepted.
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	641
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	642 The ``bookmarks`` template is rendered.
5fbb5217a6c8 webcommands: document "bookmarks" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24082 diff changeset	643 """
18478 886936ecc21b hgweb: don't attempt to show hidden bookmarks (issue3774) Kevin Bullock <kbullock@ringworld.org> parents: 18477 diff changeset	644 i = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
28711 06ae7a6daad0 hgweb: sort bookmarks in revlog order of their nodes Anton Shestakov <av6@dwimlabs.net> parents: 28710 diff changeset	645 sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
06ae7a6daad0 hgweb: sort bookmarks in revlog order of their nodes Anton Shestakov <av6@dwimlabs.net> parents: 28710 diff changeset	646 i = sorted(i, key=sortkey, reverse=True)
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	647 parity = paritygen(web.stripecount)
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	648
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	649 def entries(latestonly, **map):
28710 ca0c0ca30c62 hgweb: sort bookmarks early Anton Shestakov <av6@dwimlabs.net> parents: 28212 diff changeset	650 t = i
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	651 if latestonly:
28710 ca0c0ca30c62 hgweb: sort bookmarks early Anton Shestakov <av6@dwimlabs.net> parents: 28212 diff changeset	652 t = i[:1]
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	653 for k, n in t:
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	654 yield {"parity": next(parity),
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	655 "bookmark": k,
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	656 "date": web.repo[n].date(),
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	657 "node": hex(n)}
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	658
28712 80e922479891 hgweb: generate last change date for an empty atom-bookmarks feed (issue5022) Anton Shestakov <av6@dwimlabs.net> parents: 28711 diff changeset	659 if i:
80e922479891 hgweb: generate last change date for an empty atom-bookmarks feed (issue5022) Anton Shestakov <av6@dwimlabs.net> parents: 28711 diff changeset	660 latestrev = i[0][1]
80e922479891 hgweb: generate last change date for an empty atom-bookmarks feed (issue5022) Anton Shestakov <av6@dwimlabs.net> parents: 28711 diff changeset	661 else:
80e922479891 hgweb: generate last change date for an empty atom-bookmarks feed (issue5022) Anton Shestakov <av6@dwimlabs.net> parents: 28711 diff changeset	662 latestrev = -1
80e922479891 hgweb: generate last change date for an empty atom-bookmarks feed (issue5022) Anton Shestakov <av6@dwimlabs.net> parents: 28711 diff changeset	663
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	664 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	665 'bookmarks',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	666 node=hex(web.repo.changelog.tip()),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	667 lastchange=[{'date': web.repo[latestrev].date()}],
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	668 entries=lambda x: entries(latestonly=False, x),
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	669 latestentry=lambda x: entries(latestonly=True, x))
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	670
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	671 @webcommand('branches')
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	672 def branches(web, req, tmpl):
24082 32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	673 """
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	674 /branches
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	675 ---------
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	676
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	677 Show information about branches.
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	678
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	679 All known branches are contained in the output, even closed branches.
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	680
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	681 No arguments are accepted.
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	682
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	683 The ``branches`` template is rendered.
32dabf811b39 webcommands: document "branches" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24081 diff changeset	684 """
26129 a103ecb8a04a hgweb: move branchentries code from webcommands to webutil Anton Shestakov <av6@dwimlabs.net> parents: 25660 diff changeset	685 entries = webutil.branchentries(web.repo, web.stripecount)
a103ecb8a04a hgweb: move branchentries code from webcommands to webutil Anton Shestakov <av6@dwimlabs.net> parents: 25660 diff changeset	686 latestentry = webutil.branchentries(web.repo, web.stripecount, 1)
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	687
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	688 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	689 'branches',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	690 node=hex(web.repo.changelog.tip()),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	691 entries=entries,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	692 latestentry=latestentry)
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	693
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	694 @webcommand('summary')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	695 def summary(web, req, tmpl):
24091 6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	696 """
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	697 /summary
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	698 --------
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	699
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	700 Show a summary of repository state.
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	701
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	702 Information about the latest changesets, bookmarks, tags, and branches
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	703 is captured by this handler.
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	704
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	705 The ``summary`` template is rendered.
6b6ec887c79b webcommands: document "summary" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24090 diff changeset	706 """
17261 c0068b058fcd webcommands: do not modify repo.tagslist() Patrick Mezard <patrick@mezard.eu> parents: 17202 diff changeset	707 i = reversed(web.repo.tagslist())
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	708
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	709 def tagentries(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	710 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	711 count = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	712 for k, n in i:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	713 if k == "tip": # skip tip
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	714 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	715
6659 bc553c6d1ef9 webcommands: fix increments lost by 894875eae49b Andrew Beekhof <beekhof@gmail.com> parents: 6657 diff changeset	716 count += 1
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	717 if count > 10: # limit to 10 tags
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	718 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	719
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	720 yield tmpl("tagentry",
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	721 parity=next(parity),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	722 tag=k,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	723 node=hex(n),
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	724 date=web.repo[n].date())
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	725
13924 ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	726 def bookmarks(**map):
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	727 parity = paritygen(web.stripecount)
18563 6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	728 marks = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
28711 06ae7a6daad0 hgweb: sort bookmarks in revlog order of their nodes Anton Shestakov <av6@dwimlabs.net> parents: 28710 diff changeset	729 sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
06ae7a6daad0 hgweb: sort bookmarks in revlog order of their nodes Anton Shestakov <av6@dwimlabs.net> parents: 28710 diff changeset	730 marks = sorted(marks, key=sortkey, reverse=True)
06ae7a6daad0 hgweb: sort bookmarks in revlog order of their nodes Anton Shestakov <av6@dwimlabs.net> parents: 28710 diff changeset	731 for k, n in marks[:10]: # limit to 10 bookmarks
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	732 yield {'parity': next(parity),
13924 ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	733 'bookmark': k,
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	734 'date': web.repo[n].date(),
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	735 'node': hex(n)}
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	736
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	737 def changelist(**map):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	738 parity = paritygen(web.stripecount, offset=start - end)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	739 l = [] # build a list in forward order for efficiency
18563 6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	740 revs = []
6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	741 if start < end:
6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	742 revs = web.repo.changelog.revs(start, end - 1)
6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	743 for i in revs:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	744 ctx = web.repo[i]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	745
18319 e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	746 l.append(tmpl(
27294 5aa2afb4f81a hgweb: move entry-preparing code from webcommands to webutils.commonentry() Anton Shestakov <av6@dwimlabs.net> parents: 27160 diff changeset	747 'shortlogentry',
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	748 parity=next(parity),
36434 1fb9e01328e4 py3: use pycompat.strkwargs to convert kwargs keys to str Pulkit Goyal <7895pulkit@gmail.com> parents: 36384 diff changeset	749 **pycompat.strkwargs(webutil.commonentry(web.repo, ctx))))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	750
29382 e4b777fe1576 templates: add support for summary webcommand in json style Laura M?dioni <laura.medioni@logilab.fr> parents: 29325 diff changeset	751 for entry in reversed(l):
e4b777fe1576 templates: add support for summary webcommand in json style Laura M?dioni <laura.medioni@logilab.fr> parents: 29325 diff changeset	752 yield entry
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	753
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	754 tip = web.repo['tip']
0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	755 count = len(web.repo)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	756 start = max(0, count - web.maxchanges)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	757 end = min(count, start + web.maxchanges)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	758
34238 a6c18628dff1 configitems: register the 'web.description' config Boris Feld <boris.feld@octobus.net> parents: 34083 diff changeset	759 desc = web.config("web", "description")
a6c18628dff1 configitems: register the 'web.description' config Boris Feld <boris.feld@octobus.net> parents: 34083 diff changeset	760 if not desc:
a6c18628dff1 configitems: register the 'web.description' config Boris Feld <boris.feld@octobus.net> parents: 34083 diff changeset	761 desc = 'unknown'
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	762
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	763 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	764 'summary',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	765 desc=desc,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	766 owner=get_contact(web.config) or 'unknown',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	767 lastchange=tip.date(),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	768 tags=tagentries,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	769 bookmarks=bookmarks,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	770 branches=webutil.branchentries(web.repo, web.stripecount, 10),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	771 shortlog=changelist,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	772 node=tip.hex(),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	773 symrev='tip',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	774 archives=web.archivelist('tip'),
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	775 labels=web.configlist('web', 'labels'))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	776
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	777 @webcommand('filediff')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	778 def filediff(web, req, tmpl):
24092 55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	779 """
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	780 /diff/{revision}/{path}
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	781 -----------------------
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	782
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	783 Show how a file changed in a particular commit.
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	784
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	785 The ``filediff`` template is rendered.
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	786
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26136 diff changeset	787 This handler is registered under both the ``/diff`` and ``/filediff``
24092 55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	788 paths. ``/diff`` is used in modern code.
55dfea651b7f webcommands: document "filediff" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24091 diff changeset	789 """
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	790 fctx, ctx = None, None
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	791 try:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	792 fctx = webutil.filectx(web.repo, req)
7280 810ca383da9c remove unused variables Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7183 diff changeset	793 except LookupError:
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	794 ctx = webutil.changectx(web.repo, req)
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	795 path = webutil.cleanpath(web.repo, web.req.qsparams['file'])
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	796 if path not in ctx.files():
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	797 raise
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	798
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	799 if fctx is not None:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	800 path = fctx.path()
16722 7bf48bc7de23 hgweb: fix filediff base calculation Matt Mackall <mpm@selenic.com> parents: 16469 diff changeset	801 ctx = fctx.changectx()
31082 abb92b3d370e hgweb: explictly pass basectx in webutil.diffs Denis Laxalde <denis.laxalde@logilab.fr> parents: 31024 diff changeset	802 basectx = ctx.p1()
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	803
34246 db63872e10cc configitems: register the 'web.style' config Boris Feld <boris.feld@octobus.net> parents: 34238 diff changeset	804 style = web.config('web', 'style')
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	805 if 'style' in web.req.qsparams:
66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	806 style = web.req.qsparams['style']
9402 5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	807
31660 c2dbd818e884 hgweb: handle "parity" internally in webutil.diffs() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31082 diff changeset	808 diffs = webutil.diffs(web, tmpl, ctx, basectx, [path], style)
27160 c533435cbc37 webcommands: test that fctx is not None in filediff() Anton Shestakov <av6@dwimlabs.net> parents: 27159 diff changeset	809 if fctx is not None:
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	810 rename = webutil.renamelink(fctx)
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	811 ctx = fctx
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	812 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	813 rename = []
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24177 diff changeset	814 ctx = ctx
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	815
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	816 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	817 'filediff',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	818 file=path,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	819 symrev=webutil.symrevorshortnode(req, ctx),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	820 rename=rename,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	821 diff=diffs,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	822 **pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	823
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	824 diff = webcommand('diff')(filediff)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	825
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	826 @webcommand('comparison')
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	827 def comparison(web, req, tmpl):
24093 c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	828 """
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	829 /comparison/{revision}/{path}
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	830 -----------------------------
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	831
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	832 Show a comparison between the old and new versions of a file from changes
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	833 made on a particular revision.
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	834
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	835 This is similar to the ``diff`` handler. However, this form features
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	836 a split or side-by-side diff rather than a unified diff.
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	837
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	838 The ``context`` query string argument can be used to control the lines of
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	839 context in the diff.
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	840
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	841 The ``filecomparison`` template is rendered.
c8639f90a715 webcommands: document "comparison" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24092 diff changeset	842 """
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	843 ctx = webutil.changectx(web.repo, req)
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	844 if 'file' not in web.req.qsparams:
17289 f2d6b4f8e78c hgweb: avoid traceback when file or node parameters are missing Ross Lagerwall <rosslagerwall@gmail.com> parents: 17261 diff changeset	845 raise ErrorResponse(HTTP_NOT_FOUND, 'file not given')
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	846 path = webutil.cleanpath(web.repo, web.req.qsparams['file'])
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	847
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	848 parsecontext = lambda v: v == 'full' and -1 or int(v)
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	849 if 'context' in web.req.qsparams:
66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	850 context = parsecontext(web.req.qsparams['context'])
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	851 else:
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	852 context = parsecontext(web.config('web', 'comparisoncontext', '5'))
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	853
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	854 def filelines(f):
32136 f238a483a1fd webcommands: use fctx.isbinary Jun Wu <quark@fb.com> parents: 32070 diff changeset	855 if f.isbinary():
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	856 mt = mimetypes.guess_type(f.path())[0]
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	857 if not mt:
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	858 mt = 'application/octet-stream'
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	859 return [_('(binary file %s, hash: %s)') % (mt, hex(f.filenode()))]
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	860 return f.data().splitlines()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	861
27158 522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962) Anton Shestakov <av6@dwimlabs.net> parents: 27081 diff changeset	862 fctx = None
21123 92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21121 diff changeset	863 parent = ctx.p1()
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21121 diff changeset	864 leftrev = parent.rev()
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21121 diff changeset	865 leftnode = parent.node()
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21121 diff changeset	866 rightrev = ctx.rev()
92fab48dfec1 hgweb: show revisions and hashes gotten from changelog in "comparison" page FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21121 diff changeset	867 rightnode = ctx.node()
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	868 if path in ctx:
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	869 fctx = ctx[path]
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	870 rightlines = filelines(fctx)
21121 8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20761 diff changeset	871 if path not in parent:
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	872 leftlines = ()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	873 else:
21121 8c9e84b44221 hgweb: make "comparison" get parent from not filelog but changelog FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20761 diff changeset	874 pfctx = parent[path]
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	875 leftlines = filelines(pfctx)
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	876 else:
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	877 rightlines = ()
27158 522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962) Anton Shestakov <av6@dwimlabs.net> parents: 27081 diff changeset	878 pfctx = ctx.parents()[0][path]
522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962) Anton Shestakov <av6@dwimlabs.net> parents: 27081 diff changeset	879 leftlines = filelines(pfctx)
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	880
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	881 comparison = webutil.compare(tmpl, context, leftlines, rightlines)
27158 522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962) Anton Shestakov <av6@dwimlabs.net> parents: 27081 diff changeset	882 if fctx is not None:
27159 7e10b860c174 webcommands: stop using ersatz if-else ternary operator for rename variable Anton Shestakov <av6@dwimlabs.net> parents: 27158 diff changeset	883 rename = webutil.renamelink(fctx)
27158 522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962) Anton Shestakov <av6@dwimlabs.net> parents: 27081 diff changeset	884 ctx = fctx
522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962) Anton Shestakov <av6@dwimlabs.net> parents: 27081 diff changeset	885 else:
27159 7e10b860c174 webcommands: stop using ersatz if-else ternary operator for rename variable Anton Shestakov <av6@dwimlabs.net> parents: 27158 diff changeset	886 rename = []
27158 522ffc189671 webcommands: get correct parents when comparing a removed file (issue4962) Anton Shestakov <av6@dwimlabs.net> parents: 27081 diff changeset	887 ctx = ctx
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	888
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	889 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	890 'filecomparison',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	891 file=path,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	892 symrev=webutil.symrevorshortnode(req, ctx),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	893 rename=rename,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	894 leftrev=leftrev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	895 leftnode=hex(leftnode),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	896 rightrev=rightrev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	897 rightnode=hex(rightnode),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	898 comparison=comparison,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	899 **pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	900
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	901 @webcommand('annotate')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	902 def annotate(web, req, tmpl):
24094 9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	903 """
9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	904 /annotate/{revision}/{path}
9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	905 ---------------------------
9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	906
9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	907 Show changeset information for each line in a file.
9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	908
34390 f6492f482c60 hgweb: query string arguments to control whitespace for annotate Gregory Szorc <gregory.szorc@gmail.com> parents: 34246 diff changeset	909 The ``ignorews``, ``ignorewsamount``, ``ignorewseol``, and
f6492f482c60 hgweb: query string arguments to control whitespace for annotate Gregory Szorc <gregory.szorc@gmail.com> parents: 34246 diff changeset	910 ``ignoreblanklines`` query string arguments have the same meaning as
34403 407ebe7a9b93 hgweb: use parsebool for parsing diff query string options Gregory Szorc <gregory.szorc@gmail.com> parents: 34391 diff changeset	911 their ``[annotate]`` config equivalents. It uses the hgrc boolean
407ebe7a9b93 hgweb: use parsebool for parsing diff query string options Gregory Szorc <gregory.szorc@gmail.com> parents: 34391 diff changeset	912 parsing logic to interpret the value. e.g. ``0`` and ``false`` are
407ebe7a9b93 hgweb: use parsebool for parsing diff query string options Gregory Szorc <gregory.szorc@gmail.com> parents: 34391 diff changeset	913 false and ``1`` and ``true`` are true. If not defined, the server
407ebe7a9b93 hgweb: use parsebool for parsing diff query string options Gregory Szorc <gregory.szorc@gmail.com> parents: 34391 diff changeset	914 default settings are used.
34390 f6492f482c60 hgweb: query string arguments to control whitespace for annotate Gregory Szorc <gregory.szorc@gmail.com> parents: 34246 diff changeset	915
24094 9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	916 The ``fileannotate`` template is rendered.
9c810d46a093 webcommands: document "annotate" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24093 diff changeset	917 """
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	918 fctx = webutil.filectx(web.repo, req)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	919 f = fctx.path()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	920 parity = paritygen(web.stripecount)
32996 1c97df5e3b46 hgweb: plug followlines action in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 32904 diff changeset	921 ishead = fctx.filerev() in fctx.filelog().headrevs()
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	922
30298 4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	923 # parents() is called once per line and several lines likely belong to
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	924 # same revision. So it is worth caching.
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	925 # TODO there are still redundant operations within basefilectx.parents()
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	926 # and from the fctx.annotate() call itself that could be cached.
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	927 parentscache = {}
29522 9c37df347485 hgweb: add link to parents of annotated revision in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29471 diff changeset	928 def parents(f):
30298 4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	929 rev = f.rev()
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	930 if rev not in parentscache:
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	931 parentscache[rev] = []
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	932 for p in f.parents():
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	933 entry = {
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	934 'node': p.hex(),
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	935 'rev': p.rev(),
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	936 }
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	937 parentscache[rev].append(entry)
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	938
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	939 for p in parentscache[rev]:
4ed8bb8a153f hgweb: cache fctx.parents() in annotate command (issue5414) Gregory Szorc <gregory.szorc@gmail.com> parents: 30081 diff changeset	940 yield p
29522 9c37df347485 hgweb: add link to parents of annotated revision in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29471 diff changeset	941
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	942 def annotate(**map):
32136 f238a483a1fd webcommands: use fctx.isbinary Jun Wu <quark@fb.com> parents: 32070 diff changeset	943 if fctx.isbinary():
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	944 mt = (mimetypes.guess_type(fctx.path())[0]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	945 or 'application/octet-stream')
29538 df7d8ea90695 hgweb: enumerate lines in loop header, not before Anton Shestakov <av6@dwimlabs.net> parents: 29522 diff changeset	946 lines = [((fctx.filectx(fctx.filerev()), 1), '(binary:%s)' % mt)]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	947 else:
34390 f6492f482c60 hgweb: query string arguments to control whitespace for annotate Gregory Szorc <gregory.szorc@gmail.com> parents: 34246 diff changeset	948 lines = webutil.annotate(req, fctx, web.repo.ui)
30081 dd0ff715a82c hgweb: make fctx.annotate a separated function so it could be wrapped Jun Wu <quark@fb.com> parents: 29572 diff changeset	949
29388 f694e20193f2 hgweb: display blamed revision once per block in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29382 diff changeset	950 previousrev = None
29572 d86b54d9bb0c paper: make different blocks of annotated lines have different colors Anton Shestakov <av6@dwimlabs.net> parents: 29538 diff changeset	951 blockparitygen = paritygen(1)
34432 2e32c6a31cc7 annotate: introduce attr for storing per-line annotate data Siddharth Agarwal <sid0@fb.com> parents: 34403 diff changeset	952 for lineno, (aline, l) in enumerate(lines):
2e32c6a31cc7 annotate: introduce attr for storing per-line annotate data Siddharth Agarwal <sid0@fb.com> parents: 34403 diff changeset	953 f = aline.fctx
29388 f694e20193f2 hgweb: display blamed revision once per block in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29382 diff changeset	954 rev = f.rev()
29572 d86b54d9bb0c paper: make different blocks of annotated lines have different colors Anton Shestakov <av6@dwimlabs.net> parents: 29538 diff changeset	955 if rev != previousrev:
d86b54d9bb0c paper: make different blocks of annotated lines have different colors Anton Shestakov <av6@dwimlabs.net> parents: 29538 diff changeset	956 blockhead = True
d86b54d9bb0c paper: make different blocks of annotated lines have different colors Anton Shestakov <av6@dwimlabs.net> parents: 29538 diff changeset	957 blockparity = next(blockparitygen)
d86b54d9bb0c paper: make different blocks of annotated lines have different colors Anton Shestakov <av6@dwimlabs.net> parents: 29538 diff changeset	958 else:
d86b54d9bb0c paper: make different blocks of annotated lines have different colors Anton Shestakov <av6@dwimlabs.net> parents: 29538 diff changeset	959 blockhead = None
29388 f694e20193f2 hgweb: display blamed revision once per block in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29382 diff changeset	960 previousrev = rev
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 28712 diff changeset	961 yield {"parity": next(parity),
14055 421d56a055fd drop {short,hex}(ctx.node()) calls in favor of ctx methods Alexander Solovyov <alexander@solovyov.net> parents: 14043 diff changeset	962 "node": f.hex(),
29388 f694e20193f2 hgweb: display blamed revision once per block in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29382 diff changeset	963 "rev": rev,
6564 ccc2481e3954 webcommands: pass full author to annotate, fix templates (issue 1054) Patrick Mezard <pmezard@gmail.com> parents: 6437 diff changeset	964 "author": f.user(),
29522 9c37df347485 hgweb: add link to parents of annotated revision in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29471 diff changeset	965 "parents": parents(f),
6657 a51093361e1c hgweb: show cset node and description when hovering over annotate prefix Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6564 diff changeset	966 "desc": f.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	967 "extra": f.extra(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	968 "file": f.path(),
29388 f694e20193f2 hgweb: display blamed revision once per block in annotate view Denis Laxalde <denis.laxalde@logilab.fr> parents: 29382 diff changeset	969 "blockhead": blockhead,
29572 d86b54d9bb0c paper: make different blocks of annotated lines have different colors Anton Shestakov <av6@dwimlabs.net> parents: 29538 diff changeset	970 "blockparity": blockparity,
34432 2e32c6a31cc7 annotate: introduce attr for storing per-line annotate data Siddharth Agarwal <sid0@fb.com> parents: 34403 diff changeset	971 "targetline": aline.lineno,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	972 "line": l,
24712 bbf1ae6b6a44 hgweb: expose raw line numbers to templates Gregory Szorc <gregory.szorc@gmail.com> parents: 24306 diff changeset	973 "lineno": lineno + 1,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	974 "lineid": "l%d" % (lineno + 1),
13199 a38df1250945 hgweb: added revision date to annotate line data Oli Thissen <oli@tonick.net> parents: 12696 diff changeset	975 "linenumber": "% 6d" % (lineno + 1),
a38df1250945 hgweb: added revision date to annotate line data Oli Thissen <oli@tonick.net> parents: 12696 diff changeset	976 "revdate": f.date()}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	977
34391 6797f1fbc642 hgweb: add HTML elements to control whitespace settings for annotate Gregory Szorc <gregory.szorc@gmail.com> parents: 34390 diff changeset	978 diffopts = webutil.difffeatureopts(req, web.repo.ui, 'annotate')
6797f1fbc642 hgweb: add HTML elements to control whitespace settings for annotate Gregory Szorc <gregory.szorc@gmail.com> parents: 34390 diff changeset	979 diffopts = {k: getattr(diffopts, k) for k in diffopts.defaults}
6797f1fbc642 hgweb: add HTML elements to control whitespace settings for annotate Gregory Szorc <gregory.szorc@gmail.com> parents: 34390 diff changeset	980
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	981 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	982 'fileannotate',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	983 file=f,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	984 annotate=annotate,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	985 path=webutil.up(f),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	986 symrev=webutil.symrevorshortnode(req, fctx),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	987 rename=webutil.renamelink(fctx),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	988 permissions=fctx.manifest().flags(f),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	989 ishead=int(ishead),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	990 diffopts=diffopts,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	991 **pycompat.strkwargs(webutil.commonentry(web.repo, fctx)))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	992
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	993 @webcommand('filelog')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	994 def filelog(web, req, tmpl):
24095 1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	995 """
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	996 /filelog/{revision}/{path}
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	997 --------------------------
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	998
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	999 Show information about the history of a file in the repository.
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	1000
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	1001 The ``revcount`` query string argument can be defined to control the
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	1002 maximum number of entries to show.
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	1003
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	1004 The ``filelog`` template will be rendered.
1f48b157dccf webcommands: document "filelog" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24094 diff changeset	1005 """
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1006
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1007 try:
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1008 fctx = webutil.filectx(web.repo, req)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1009 f = fctx.path()
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1010 fl = fctx.filelog()
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	1011 except error.LookupError:
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1012 f = webutil.cleanpath(web.repo, web.req.qsparams['file'])
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1013 fl = web.repo.file(f)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1014 numrevs = len(fl)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1015 if not numrevs: # file doesn't exist at all
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1016 raise
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1017 rev = webutil.changectx(web.repo, req).rev()
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	1018 first = fl.linkrev(0)
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1019 if rev < first: # current rev is from before file existed
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1020 raise
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1021 frev = numrevs - 1
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	1022 while fl.linkrev(frev) > rev:
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1023 frev -= 1
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	1024 fctx = web.repo.filectx(f, fl.linkrev(frev))
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1025
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	1026 revcount = web.maxshortchanges
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1027 if 'revcount' in web.req.qsparams:
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1028 try:
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1029 revcount = int(web.req.qsparams.get('revcount', revcount))
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1030 revcount = max(revcount, 1)
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1031 tmpl.defaults['sessionvars']['revcount'] = revcount
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1032 except ValueError:
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1033 pass
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	1034
31665 5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1035 lrange = webutil.linerange(req)
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1036
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	1037 lessvars = copy.copy(tmpl.defaults['sessionvars'])
36553 24897a9d18ac webcommands: use explicit integer division for Python 3 compat Augie Fackler <augie@google.com> parents: 36434 diff changeset	1038 lessvars['revcount'] = max(revcount // 2, 1)
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	1039 morevars = copy.copy(tmpl.defaults['sessionvars'])
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	1040 morevars['revcount'] = revcount * 2
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	1041
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1042 patch = 'patch' in web.req.qsparams
31661 f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1043 if patch:
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1044 lessvars['patch'] = morevars['patch'] = web.req.qsparams['patch']
66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1045 descend = 'descend' in web.req.qsparams
31939 604d31507f86 hgweb: handle a "descend" query parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31727 diff changeset	1046 if descend:
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1047 lessvars['descend'] = morevars['descend'] = web.req.qsparams['descend']
31661 f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1048
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	1049 count = fctx.filerev() + 1
30826 923336cf8b8a hgweb: simplify calculation of first revision in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 30825 diff changeset	1050 start = max(0, count - revcount) # first rev on this page
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	1051 end = min(count, start + revcount) # last rev on this page
30825 4deb7c1a07ab hgweb: restore ascending iteration on revs in filelog web command Denis Laxalde <denis.laxalde@logilab.fr> parents: 30816 diff changeset	1052 parity = paritygen(web.stripecount, offset=start - end)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1053
30816 96f811bceb85 hgweb: build the "entries" list directly in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 30734 diff changeset	1054 repo = web.repo
96f811bceb85 hgweb: build the "entries" list directly in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 30734 diff changeset	1055 revs = fctx.filelog().revs(start, end - 1)
96f811bceb85 hgweb: build the "entries" list directly in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 30734 diff changeset	1056 entries = []
31661 f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1057
34246 db63872e10cc configitems: register the 'web.style' config Boris Feld <boris.feld@octobus.net> parents: 34238 diff changeset	1058 diffstyle = web.config('web', 'style')
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1059 if 'style' in web.req.qsparams:
66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1060 diffstyle = web.req.qsparams['style']
31661 f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1061
31667 e540846c67e0 hgweb: filter diff hunks when 'linerange' and 'patch' are specified in filelog Denis Laxalde <denis.laxalde@logilab.fr> parents: 31665 diff changeset	1062 def diff(fctx, linerange=None):
31661 f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1063 ctx = fctx.changectx()
f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1064 basectx = ctx.p1()
f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1065 path = fctx.path()
31667 e540846c67e0 hgweb: filter diff hunks when 'linerange' and 'patch' are specified in filelog Denis Laxalde <denis.laxalde@logilab.fr> parents: 31665 diff changeset	1066 return webutil.diffs(web, tmpl, ctx, basectx, [path], diffstyle,
31727 6be6e4becaaf hgweb: prefix line id by ctx shortnode in filelog when patches are shown Denis Laxalde <denis@laxalde.org> parents: 31667 diff changeset	1067 linerange=linerange,
6be6e4becaaf hgweb: prefix line id by ctx shortnode in filelog when patches are shown Denis Laxalde <denis@laxalde.org> parents: 31667 diff changeset	1068 lineidprefix='%s-' % ctx.hex()[:12])
31661 f36dc643ffdc hgweb: add a "patch" query parameter to filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31660 diff changeset	1069
31665 5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1070 linerange = None
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1071 if lrange is not None:
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1072 linerange = webutil.formatlinerange(*lrange)
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1073 # deactivate numeric nav links when linerange is specified as this
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1074 # would required a dedicated "revnav" class
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1075 nav = None
31939 604d31507f86 hgweb: handle a "descend" query parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31727 diff changeset	1076 if descend:
32904 582080a4a812 dagop: move blockancestors() and blockdescendants() from context Yuya Nishihara <yuya@tcha.org> parents: 32566 diff changeset	1077 it = dagop.blockdescendants(fctx, *lrange)
31939 604d31507f86 hgweb: handle a "descend" query parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31727 diff changeset	1078 else:
32904 582080a4a812 dagop: move blockancestors() and blockdescendants() from context Yuya Nishihara <yuya@tcha.org> parents: 32566 diff changeset	1079 it = dagop.blockancestors(fctx, *lrange)
31939 604d31507f86 hgweb: handle a "descend" query parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31727 diff changeset	1080 for i, (c, lr) in enumerate(it, 1):
31665 5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1081 diffs = None
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1082 if patch:
31667 e540846c67e0 hgweb: filter diff hunks when 'linerange' and 'patch' are specified in filelog Denis Laxalde <denis.laxalde@logilab.fr> parents: 31665 diff changeset	1083 diffs = diff(c, linerange=lr)
31665 5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1084 # follow renames accross filtered (not in range) revisions
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1085 path = c.path()
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1086 entries.append(dict(
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1087 parity=next(parity),
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1088 filerev=c.rev(),
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1089 file=path,
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1090 diff=diffs,
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1091 linerange=webutil.formatlinerange(*lr),
36434 1fb9e01328e4 py3: use pycompat.strkwargs to convert kwargs keys to str Pulkit Goyal <7895pulkit@gmail.com> parents: 36384 diff changeset	1092 **pycompat.strkwargs(webutil.commonentry(repo, c))))
31665 5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1093 if i == revcount:
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1094 break
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1095 lessvars['linerange'] = webutil.formatlinerange(*lrange)
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1096 morevars['linerange'] = lessvars['linerange']
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1097 else:
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1098 for i in revs:
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1099 iterfctx = fctx.filectx(i)
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1100 diffs = None
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1101 if patch:
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1102 diffs = diff(iterfctx)
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1103 entries.append(dict(
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1104 parity=next(parity),
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1105 filerev=i,
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1106 file=f,
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1107 diff=diffs,
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1108 rename=webutil.renamelink(iterfctx),
36434 1fb9e01328e4 py3: use pycompat.strkwargs to convert kwargs keys to str Pulkit Goyal <7895pulkit@gmail.com> parents: 36384 diff changeset	1109 **pycompat.strkwargs(webutil.commonentry(repo, iterfctx))))
31665 5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1110 entries.reverse()
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1111 revnav = webutil.filerevnav(web.repo, fctx.path())
5e6d44511317 hgweb: handle a "linerange" request parameter in filelog command Denis Laxalde <denis.laxalde@logilab.fr> parents: 31661 diff changeset	1112 nav = revnav.gen(end - 1, revcount, count)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1113
20022 d85dfe211c71 hgweb: always compute all entries and latestentry in filelog Alexander Plavin <alexander@plav.in> parents: 20021 diff changeset	1114 latestentry = entries[:1]
d85dfe211c71 hgweb: always compute all entries and latestentry in filelog Alexander Plavin <alexander@plav.in> parents: 20021 diff changeset	1115
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1116 return web.sendtemplate(
36870 1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1117 'filelog',
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1118 file=f,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1119 nav=nav,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1120 symrev=webutil.symrevorshortnode(req, fctx),
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1121 entries=entries,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1122 descend=descend,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1123 patch=patch,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1124 latestentry=latestentry,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1125 linerange=linerange,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1126 revcount=revcount,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1127 morevars=morevars,
1f42d621f090 hgweb: support using new response object for web commands Gregory Szorc <gregory.szorc@gmail.com> parents: 36865 diff changeset	1128 lessvars=lessvars,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1129 **pycompat.strkwargs(webutil.commonentry(web.repo, fctx)))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1130
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	1131 @webcommand('archive')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	1132 def archive(web, req, tmpl):
24096 bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1133 """
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1134 /archive/{revision}.{format}[/{path}]
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1135 -------------------------------------
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1136
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1137 Obtain an archive of repository content.
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1138
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1139 The content and type of the archive is defined by a URL path parameter.
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1140 ``format`` is the file extension of the archive type to be generated. e.g.
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1141 ``zip`` or ``tar.bz2``. Not all archive types may be allowed by your
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1142 server configuration.
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1143
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1144 The optional ``path`` URL parameter controls content to include in the
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1145 archive. If omitted, every file in the specified revision is present in the
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1146 archive. If included, only the specified file or contents of the specified
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1147 directory will be included in the archive.
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1148
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1149 No template is used for this handler. Raw, binary content is generated.
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1150 """
bb8b6d44fe1d webcommands: document "archive" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24095 diff changeset	1151
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1152 type_ = web.req.qsparams.get('type')
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1153 allowed = web.configlist("web", "allow_archive")
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1154 key = web.req.qsparams['node']
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1155
30734 b9e49f7b0220 hgweb: use archivespecs (dict) instead of archives (tuple) for "in" check Anton Shestakov <av6@dwimlabs.net> parents: 30559 diff changeset	1156 if type_ not in web.archivespecs:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1157 msg = 'Unsupported archive type: %s' % type_
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1158 raise ErrorResponse(HTTP_NOT_FOUND, msg)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1159
7029 b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	1160 if not ((type_ in allowed or
34654 4182d2065e7a configitems: drop redundant default of web.allow<archtype> Yuya Nishihara <yuya@tcha.org> parents: 34608 diff changeset	1161 web.configbool("web", "allow" + type_))):
7029 b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	1162 msg = 'Archive type not allowed: %s' % type_
b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	1163 raise ErrorResponse(HTTP_FORBIDDEN, msg)
b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	1164
36384 caa3d42f616d py3: make regex bytes in hgweb/webcommands.py Pulkit Goyal <7895pulkit@gmail.com> parents: 36275 diff changeset	1165 reponame = re.sub(br"\W+", "-", os.path.basename(web.reponame))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1166 cnode = web.repo.lookup(key)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1167 arch_version = key
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1168 if cnode == key or key == 'tip':
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1169 arch_version = short(cnode)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1170 name = "%s-%s" % (reponame, arch_version)
18771 bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	1171
bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	1172 ctx = webutil.changectx(web.repo, req)
bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	1173 pats = []
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 33554 diff changeset	1174 match = scmutil.match(ctx, [])
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1175 file = web.req.qsparams.get('file')
18771 bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	1176 if file:
36865 3d60a22e27f5 hgweb: perform all parameter lookup via qsparams Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	1177 pats = ['path:' + file]
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 33554 diff changeset	1178 match = scmutil.match(ctx, pats, default='path')
18968 7d2a7f8e9da4 hgweb: respond HTTP_NOT_FOUND when an archive request does not match any files Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18771 diff changeset	1179 if pats:
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 33554 diff changeset	1180 files = [f for f in ctx.manifest().keys() if match(f)]
18968 7d2a7f8e9da4 hgweb: respond HTTP_NOT_FOUND when an archive request does not match any files Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18771 diff changeset	1181 if not files:
7d2a7f8e9da4 hgweb: respond HTTP_NOT_FOUND when an archive request does not match any files Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18771 diff changeset	1182 raise ErrorResponse(HTTP_NOT_FOUND,
36865 3d60a22e27f5 hgweb: perform all parameter lookup via qsparams Gregory Szorc <gregory.szorc@gmail.com> parents: 36863 diff changeset	1183 'file(s) not found: %s' % file)
18771 bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	1184
26136 6defc74f3066 hgweb: move archive related attributes to requestcontext Gregory Szorc <gregory.szorc@gmail.com> parents: 26131 diff changeset	1185 mimetype, artype, extension, encoding = web.archivespecs[type_]
36876 97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1186
97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1187 web.res.headers['Content-Type'] = mimetype
97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1188 web.res.headers['Content-Disposition'] = 'attachment; filename=%s%s' % (
97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1189 name, extension)
97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1190
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1191 if encoding:
36876 97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1192 web.res.headers['Content-Encoding'] = encoding
17933 8243dd66e0e3 webcommands: allow hgweb's archive to recurse into subrepos Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 17322 diff changeset	1193
36876 97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1194 web.res.setbodywillwrite()
97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1195 assert list(web.res.sendresponse()) == []
97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1196
97f44b0720e2 hgweb: port archive command to modern response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36875 diff changeset	1197 bodyfh = web.res.getbodyfile()
36875 16499427f6de hgweb: refactor fake file object proxy for archiving Gregory Szorc <gregory.szorc@gmail.com> parents: 36873 diff changeset	1198
16499427f6de hgweb: refactor fake file object proxy for archiving Gregory Szorc <gregory.szorc@gmail.com> parents: 36873 diff changeset	1199 archival.archive(web.repo, bodyfh, cnode, artype, prefix=name,
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 33554 diff changeset	1200 matchfn=match,
17933 8243dd66e0e3 webcommands: allow hgweb's archive to recurse into subrepos Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 17322 diff changeset	1201 subrepos=web.configbool("web", "archivesubrepos"))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	1202
36880 67fb0dca29bc hgweb: always return iterable from @webcommand functions (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36876 diff changeset	1203 return []
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1204
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	1205 @webcommand('static')
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	1206 def static(web, req, tmpl):
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1207 fname = web.req.qsparams['file']
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1208 # a repo owner may set web.static in .hg/hgrc to get any file
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1209 # readable by the user running the CGI script
7107 125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 7102 diff changeset	1210 static = web.config("web", "static", None, untrusted=False)
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 7102 diff changeset	1211 if not static:
22634 e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates Mads Kiilerich <madski@unity3d.com> parents: 22199 diff changeset	1212 tp = web.templatepath or templater.templatepaths()
7107 125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 7102 diff changeset	1213 if isinstance(tp, str):
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 7102 diff changeset	1214 tp = [tp]
7288 9c399c53469d Allow per-file shadowing of static directory in templatepath Brendan Cully <brendan@kublai.com> parents: 7280 diff changeset	1215 static = [os.path.join(p, 'static') for p in tp]
36873 98baf8dea553 hgweb: port static file handling to new response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36872 diff changeset	1216
98baf8dea553 hgweb: port static file handling to new response API Gregory Szorc <gregory.szorc@gmail.com> parents: 36872 diff changeset	1217 staticfile(static, fname, web.res)
36880 67fb0dca29bc hgweb: always return iterable from @webcommand functions (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 36876 diff changeset	1218 return web.res.sendresponse()
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1219
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	1220 @webcommand('graph')
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1221 def graph(web, req, tmpl):
24097 8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1222 """
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1223 /graph[/{revision}]
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1224 -------------------
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1225
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1226 Show information about the graphical topology of the repository.
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1227
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1228 Information rendered by this handler can be used to create visual
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1229 representations of repository topology.
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1230
35411 0fe5d99804bb hgweb: update graph function docstring Anton Shestakov <av6@dwimlabs.net> parents: 35409 diff changeset	1231 The ``revision`` URL parameter controls the starting changeset. If it's
0fe5d99804bb hgweb: update graph function docstring Anton Shestakov <av6@dwimlabs.net> parents: 35409 diff changeset	1232 absent, the default is ``tip``.
24097 8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1233
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1234 The ``revcount`` query string argument can define the number of changesets
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1235 to show information for.
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1236
35411 0fe5d99804bb hgweb: update graph function docstring Anton Shestakov <av6@dwimlabs.net> parents: 35409 diff changeset	1237 The ``graphtop`` query string argument can specify the starting changeset
0fe5d99804bb hgweb: update graph function docstring Anton Shestakov <av6@dwimlabs.net> parents: 35409 diff changeset	1238 for producing ``jsdata`` variable that is used for rendering graph in
0fe5d99804bb hgweb: update graph function docstring Anton Shestakov <av6@dwimlabs.net> parents: 35409 diff changeset	1239 JavaScript. By default it has the same value as ``revision``.
0fe5d99804bb hgweb: update graph function docstring Anton Shestakov <av6@dwimlabs.net> parents: 35409 diff changeset	1240
24097 8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1241 This handler will render the ``graph`` template.
8e04a73b5502 webcommands: document "graph" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24096 diff changeset	1242 """
10245 207b94f6b65d hgweb: make graph page size equal to shortlog Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9404 diff changeset	1243
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1244 if 'node' in web.req.qsparams:
25602 85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	1245 ctx = webutil.changectx(web.repo, req)
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	1246 symrev = webutil.symrevorshortnode(req, ctx)
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	1247 else:
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	1248 ctx = web.repo['tip']
85fb416f2fa7 hgweb: provide symrev (symbolic revision) property to the templates Anton Shestakov <av6@dwimlabs.net> parents: 25251 diff changeset	1249 symrev = 'tip'
17318 7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	1250 rev = ctx.rev()
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	1251
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1252 bg_height = 39
10245 207b94f6b65d hgweb: make graph page size equal to shortlog Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9404 diff changeset	1253 revcount = web.maxshortchanges
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1254 if 'revcount' in web.req.qsparams:
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1255 try:
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1256 revcount = int(web.req.qsparams.get('revcount', revcount))
20092 77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1257 revcount = max(revcount, 1)
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1258 tmpl.defaults['sessionvars']['revcount'] = revcount
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1259 except ValueError:
77acd8ce01ce hgweb: ignore non numeric "revcount" parameter values (issue4091) Isaac Jurado <diptongo@gmail.com> parents: 20004 diff changeset	1260 pass
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	1261
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	1262 lessvars = copy.copy(tmpl.defaults['sessionvars'])
36553 24897a9d18ac webcommands: use explicit integer division for Python 3 compat Augie Fackler <augie@google.com> parents: 36434 diff changeset	1263 lessvars['revcount'] = max(revcount // 2, 1)
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	1264 morevars = copy.copy(tmpl.defaults['sessionvars'])
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	1265 morevars['revcount'] = revcount * 2
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	1266
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1267 graphtop = web.req.qsparams.get('graphtop', ctx.hex())
35409 f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1268 graphvars = copy.copy(tmpl.defaults['sessionvars'])
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1269 graphvars['graphtop'] = graphtop
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1270
17318 7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	1271 count = len(web.repo)
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	1272 pos = rev
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	1273
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	1274 uprev = min(max(0, count - 1), rev + revcount)
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1275 downrev = max(0, rev - revcount)
18409 e3f5cef11d6a hgweb: pass repo object to revnav construction Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18408 diff changeset	1276 changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1277
18428 8c10f760ca34 hgweb: walk the graph through the changelog Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18427 diff changeset	1278 tree = []
35409 f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1279 nextentry = []
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1280 lastrev = 0
19487 8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	1281 if pos != -1:
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	1282 allrevs = web.repo.changelog.revs(pos, 0)
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	1283 revs = []
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	1284 for i in allrevs:
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	1285 revs.append(i)
35409 f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1286 if len(revs) >= revcount + 1:
19487 8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	1287 break
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	1288
35409 f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1289 if len(revs) > revcount:
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1290 nextentry = [webutil.commonentry(web.repo, web.repo[revs[-1]])]
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1291 revs = revs[:-1]
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1292
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1293 lastrev = revs[-1]
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1294
20761 46f93b7660b6 webcommands: changed code to use lazy classes when calling dagwalker Lucas Moscovicz <lmoscovicz@fb.com> parents: 20678 diff changeset	1295 # We have to feed a baseset to dagwalker as it is expecting smartset
46f93b7660b6 webcommands: changed code to use lazy classes when calling dagwalker Lucas Moscovicz <lmoscovicz@fb.com> parents: 20678 diff changeset	1296 # object. This does not have a big impact on hgweb performance itself
46f93b7660b6 webcommands: changed code to use lazy classes when calling dagwalker Lucas Moscovicz <lmoscovicz@fb.com> parents: 20678 diff changeset	1297 # since hgweb graphing code is not itself lazy yet.
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30826 diff changeset	1298 dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
20761 46f93b7660b6 webcommands: changed code to use lazy classes when calling dagwalker Lucas Moscovicz <lmoscovicz@fb.com> parents: 20678 diff changeset	1299 # As we said one line above... not lazy.
35406 76dcdc4e707b hgweb: filter graphmod.colored() output before iterating over it Anton Shestakov <av6@dwimlabs.net> parents: 35389 diff changeset	1300 tree = list(item for item in graphmod.colored(dag, web.repo)
76dcdc4e707b hgweb: filter graphmod.colored() output before iterating over it Anton Shestakov <av6@dwimlabs.net> parents: 35389 diff changeset	1301 if item[1] == graphmod.CHANGESET)
16773 d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1302
35566 baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1303 def nodecurrent(ctx):
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1304 wpnodes = web.repo.dirstate.parents()
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1305 if wpnodes[1] == nullid:
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1306 wpnodes = wpnodes[:1]
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1307 if ctx.node() in wpnodes:
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1308 return '@'
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1309 return ''
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1310
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1311 def nodesymbol(ctx):
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1312 if ctx.obsolete():
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1313 return 'x'
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1314 elif ctx.isunstable():
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1315 return '*'
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1316 elif ctx.closesbranch():
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1317 return '_'
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1318 else:
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1319 return 'o'
baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1320
35409 f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1321 def fulltree():
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1322 pos = web.repo[graphtop].rev()
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1323 tree = []
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1324 if pos != -1:
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1325 revs = web.repo.changelog.revs(pos, lastrev)
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1326 dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1327 tree = list(item for item in graphmod.colored(dag, web.repo)
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1328 if item[1] == graphmod.CHANGESET)
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1329 return tree
f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1330
35408 a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1331 def jsdata():
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1332 return [{'node': pycompat.bytestr(ctx),
35566 baca93a47992 hgweb: make different kinds of commits look differently on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35530 diff changeset	1333 'graphnode': nodecurrent(ctx) + nodesymbol(ctx),
35408 a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1334 'vertex': vtx,
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1335 'edges': edges}
35409 f84b01257e06 hgweb: render next pages on /graph incrementally Anton Shestakov <av6@dwimlabs.net> parents: 35408 diff changeset	1336 for (id, type, ctx, vtx, edges) in fulltree()]
16773 d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1337
35408 a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1338 def nodes():
35530 acd8a2454b47 monoblue: make actual changeset entries have backgrounds on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35411 diff changeset	1339 parity = paritygen(web.stripecount)
35408 a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1340 for row, (id, type, ctx, vtx, edges) in enumerate(tree):
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1341 entry = webutil.commonentry(web.repo, ctx)
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1342 edgedata = [{'col': edge[0],
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1343 'nextcol': edge[1],
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1344 'color': (edge[2] - 1) % 6 + 1,
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1345 'width': edge[3],
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1346 'bcolor': edge[4]}
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1347 for edge in edges]
16773 d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1348
35408 a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1349 entry.update({'col': vtx[0],
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1350 'color': (vtx[1] - 1) % 6 + 1,
35530 acd8a2454b47 monoblue: make actual changeset entries have backgrounds on /graph Anton Shestakov <av6@dwimlabs.net> parents: 35411 diff changeset	1351 'parity': next(parity),
35408 a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1352 'edges': edgedata,
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1353 'row': row,
a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1354 'nextrow': row + 1})
35096 23bba755cf80 hgweb: use webutil.commonentry() for nodes (but not for jsdata yet) in /graph Anton Shestakov <av6@dwimlabs.net> parents: 35095 diff changeset	1355
35408 a48af4993aa0 hgweb: split graphdata() into jsdata() and nodes() Anton Shestakov <av6@dwimlabs.net> parents: 35407 diff changeset	1356 yield entry
16773 d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1357
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1358 rows = len(tree)
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1359
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1360 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1361 'graph',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1362 rev=rev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1363 symrev=symrev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1364 revcount=revcount,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1365 uprev=uprev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1366 lessvars=lessvars,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1367 morevars=morevars,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1368 downrev=downrev,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1369 graphvars=graphvars,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1370 rows=rows,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1371 bg_height=bg_height,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1372 changesets=count,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1373 nextentry=nextentry,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1374 jsdata=lambda **x: jsdata(),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1375 nodes=lambda **x: nodes(),
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1376 node=ctx.hex(),
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1377 changenav=changenav)
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1378
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1379 def _getdoc(e):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1380 doc = e[0].__doc__
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1381 if doc:
26846 7c1b4840c2cd hgweb: replace some str.split() calls by str.partition() or str.rpartition() Anton Shestakov <av6@dwimlabs.net> parents: 26781 diff changeset	1382 doc = _(doc).partition('\n')[0]
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1383 else:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1384 doc = _('(no help text available)')
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1385 return doc
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1386
24076 b53d2afd11fb webcommands: define web commands using a decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 23992 diff changeset	1387 @webcommand('help')
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1388 def help(web, req, tmpl):
24081 ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1389 """
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1390 /help[/{topic}]
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1391 ---------------
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1392
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1393 Render help documentation.
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1394
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1395 This web command is roughly equivalent to :hg:`help`. If a ``topic``
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1396 is defined, that help topic will be rendered. If not, an index of
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1397 available help topics will be rendered.
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1398
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1399 The ``help`` template will be rendered when requesting help for a topic.
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1400 ``helptopics`` will be rendered for the index of help topics.
ff42de48193c webcommands: document "help" web command Gregory Szorc <gregory.szorc@gmail.com> parents: 24078 diff changeset	1401 """
27046 37fcfe52c68c hgweb: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 27009 diff changeset	1402 from .. import commands, help as helpmod # avoid cycle
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1403
36882 66f62d120ba2 hgweb: use web.req instead of req.req Gregory Szorc <gregory.szorc@gmail.com> parents: 36880 diff changeset	1404 topicname = web.req.qsparams.get('node')
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1405 if not topicname:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1406 def topics(**map):
22199 b3e51675f98e cleanup: avoid _ for local unused tmp variables - that is reserved for i18n Mads Kiilerich <madski@unity3d.com> parents: 21123 diff changeset	1407 for entries, summary, _doc in helpmod.helptable:
17322 7124f984dc8d help: use the first topic name from helptable, not the longest alias Mads Kiilerich <mads@kiilerich.com> parents: 17318 diff changeset	1408 yield {'topic': entries[0], 'summary': summary}
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1409
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1410 early, other = [], []
26846 7c1b4840c2cd hgweb: replace some str.split() calls by str.partition() or str.rpartition() Anton Shestakov <av6@dwimlabs.net> parents: 26781 diff changeset	1411 primary = lambda s: s.partition('\|')[0]
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1412 for c, e in commands.table.iteritems():
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1413 doc = _getdoc(e)
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1414 if 'DEPRECATED' in doc or c.startswith('debug'):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1415 continue
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1416 cmd = primary(c)
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1417 if cmd.startswith('^'):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1418 early.append((cmd[1:], doc))
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1419 else:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1420 other.append((cmd, doc))
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1421
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1422 early.sort()
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1423 other.sort()
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1424
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1425 def earlycommands(**map):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1426 for c, doc in early:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1427 yield {'topic': c, 'summary': doc}
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1428
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1429 def othercommands(**map):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1430 for c, doc in other:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1431 yield {'topic': c, 'summary': doc}
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1432
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1433 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1434 'helptopics',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1435 topics=topics,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1436 earlycommands=earlycommands,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1437 othercommands=othercommands,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1438 title='Index')
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1439
27581 3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1440 # Render an index of sub-topics.
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1441 if topicname in helpmod.subtopics:
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1442 topics = []
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1443 for entries, summary, _doc in helpmod.subtopics[topicname]:
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1444 topics.append({
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1445 'topic': '%s.%s' % (topicname, entries[0]),
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1446 'basename': entries[0],
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1447 'summary': summary,
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1448 })
3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1449
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1450 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1451 'helptopics',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1452 topics=topics,
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1453 title=topicname,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1454 subindex=True)
27581 3aa6a8135557 hgweb: support rendering sub-topic indexes Gregory Szorc <gregory.szorc@gmail.com> parents: 27294 diff changeset	1455
30559 d83ca854fa21 ui: factor out ui.load() to create a ui without loading configs (API) Yuya Nishihara <yuya@tcha.org> parents: 30298 diff changeset	1456 u = webutil.wsgiui.load()
17146 6b40cc67ceb4 hgweb: show help with verbose sections included Adrian Buehlmann <adrian@cadifra.com> parents: 16773 diff changeset	1457 u.verbose = True
27582 8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1458
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1459 # Render a page from a sub-topic.
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1460 if '.' in topicname:
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1461 # TODO implement support for rendering sections, like
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1462 # `hg help` works.
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1463 topic, subtopic = topicname.split('.', 1)
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1464 if topic not in helpmod.subtopics:
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1465 raise ErrorResponse(HTTP_NOT_FOUND)
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1466 else:
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1467 topic = topicname
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1468 subtopic = None
8f8f3b13252d hgweb: support rendering a sub-topic Gregory Szorc <gregory.szorc@gmail.com> parents: 27581 diff changeset	1469
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1470 try:
32566 1b90036f42f0 help: pass commands module by argument Yuya Nishihara <yuya@tcha.org> parents: 32136 diff changeset	1471 doc = helpmod.help_(u, commands, topic, subtopic=subtopic)
36248 0ef50a5e3ae1 hgweb: translate Abort in help command to 404 error Yuya Nishihara <yuya@tcha.org> parents: 35566 diff changeset	1472 except error.Abort:
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1473 raise ErrorResponse(HTTP_NOT_FOUND)
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1474
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1475 return web.sendtemplate(
36871 9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1476 'help',
9fc3d814646e hgweb: port most @webcommand to use modern response type Gregory Szorc <gregory.szorc@gmail.com> parents: 36870 diff changeset	1477 topic=topicname,
36883 061635d4221c hgweb: add a sendtemplate() helper function Gregory Szorc <gregory.szorc@gmail.com> parents: 36882 diff changeset	1478 doc=doc)
24859 64e3f97bdf08 i18n: extract doc string of each web commands as translatable one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24712 diff changeset	1479
64e3f97bdf08 i18n: extract doc string of each web commands as translatable one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24712 diff changeset	1480 # tell hggettext to extract docstrings from these functions:
64e3f97bdf08 i18n: extract doc string of each web commands as translatable one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24712 diff changeset	1481 i18nfunctions = commands.values()

Mercurial > public > mercurial-scm > hg

annotate mercurial/hgweb/webcommands.py @ 36883:061635d4221c