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

annotate mercurial/hgweb/webcommands.py @ 19722:bf15935b68a3

hgweb: add revset syntax support to search This mode is used when all the conditions are met: - 'reverse(%s)' % query string can be parsed to a revset tree - this tree has depth more than two, i.e. the query has some part of revset syntax used - the repo can be actually matched against this tree, i.e. it has only existent function/operators and revisions/tags/bookmarks specified are correct - no revset regexes are used in the query (strings which start with 're:') - only functions explicitly marked as safe in revset.py are used in the query Add several new tests for different parsing conditions and exception handling.

author	Alexander Plavin <alexander@plav.in>
date	Fri, 06 Sep 2013 13:30:56 +0400
parents	145636d31bb4
children	6907251122e3

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
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	8 import os, mimetypes, re, cgi, copy
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	9 import webutil
11332 716e176a4e01 hgweb: specify a charset when sending raw text files Julian Cowley <julian@lava.net> parents: 10394 diff changeset	10 from mercurial import error, encoding, archival, templater, templatefilters
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	11 from mercurial.node import short, hex, nullid
19657 145636d31bb4 hgweb: import the whole util module in webcommands instead of just one function Alexander Plavin <alexander@plav.in> parents: 19656 diff changeset	12 from mercurial import util
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	13 from common import paritygen, staticfile, get_contact, ErrorResponse
7029 b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	14 from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15004 diff changeset	15 from mercurial import graphmod, patch
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	16 from mercurial import help as helpmod
17933 8243dd66e0e3 webcommands: allow hgweb's archive to recurse into subrepos Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 17322 diff changeset	17 from mercurial import scmutil
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	18 from mercurial.i18n import _
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	19 from mercurial.error import ParseError, RepoLookupError, Abort
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	20 from mercurial import revset
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	21
5963 5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	22 # __all__ is populated with the allowed commands. Be sure to add to it if
5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	23 # you're adding a new command, or the new command won't work.
5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	24
5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	25 __all__ = [
5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	26 'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev',
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	27 'manifest', 'tags', 'bookmarks', 'branches', 'summary', 'filediff', 'diff',
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	28 'comparison', 'annotate', 'filelog', 'archive', 'static', 'graph', 'help',
5963 5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	29 ]
5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	30
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	31 def log(web, req, tmpl):
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5890 diff changeset	32 if 'file' in req.form and req.form['file'][0]:
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	33 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	34 else:
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	35 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	36
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	37 def rawfile(web, req, tmpl):
15004 d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	38 guessmime = web.configbool('web', 'guessmime', False)
d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	39
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	40 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	41 if not path:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	42 content = manifest(web, req, tmpl)
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5964 diff changeset	43 req.respond(HTTP_OK, web.ctype)
948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5964 diff changeset	44 return content
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	45
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	46 try:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	47 fctx = webutil.filectx(web.repo, req)
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	48 except error.LookupError, inst:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	49 try:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	50 content = manifest(web, req, tmpl)
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	51 req.respond(HTTP_OK, web.ctype)
2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	52 return content
2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	53 except ErrorResponse:
2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	54 raise inst
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	55
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	56 path = fctx.path()
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	57 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	58 mt = 'application/binary'
d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	59 if guessmime:
d06b9c55ddab hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Matt Mackall <mpm@selenic.com> parents: 14771 diff changeset	60 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	61 if mt is None:
19657 145636d31bb4 hgweb: import the whole util module in webcommands instead of just one function Alexander Plavin <alexander@plav.in> parents: 19656 diff changeset	62 mt = util.binary(text) and 'application/binary' or 'text/plain'
11332 716e176a4e01 hgweb: specify a charset when sending raw text files Julian Cowley <julian@lava.net> parents: 10394 diff changeset	63 if mt.startswith('text/'):
716e176a4e01 hgweb: specify a charset when sending raw text files Julian Cowley <julian@lava.net> parents: 10394 diff changeset	64 mt += '; charset="%s"' % encoding.encoding
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	65
18352 e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18348 diff changeset	66 req.respond(HTTP_OK, mt, path, body=text)
e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18348 diff changeset	67 return []
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	68
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	69 def _filerevision(web, tmpl, fctx):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	70 f = fctx.path()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	71 text = fctx.data()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	72 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	73
19657 145636d31bb4 hgweb: import the whole util module in webcommands instead of just one function Alexander Plavin <alexander@plav.in> parents: 19656 diff changeset	74 if util.binary(text):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	75 mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	76 text = '(binary:%s)' % mt
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	77
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	78 def lines():
9136 31177742f54a for calls expecting bool args, pass bool instead of int Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8842 diff changeset	79 for lineno, t in enumerate(text.splitlines(True)):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	80 yield {"line": t,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	81 "lineid": "l%d" % (lineno + 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	82 "linenumber": "% 6d" % (lineno + 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	83 "parity": parity.next()}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	84
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	85 return tmpl("filerevision",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	86 file=f,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	87 path=webutil.up(f),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	88 text=lines(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	89 rev=fctx.rev(),
14055 421d56a055fd drop {short,hex}(ctx.node()) calls in favor of ctx methods Alexander Solovyov <alexander@solovyov.net> parents: 14043 diff changeset	90 node=fctx.hex(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	91 author=fctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	92 date=fctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	93 desc=fctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	94 extra=fctx.extra(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	95 branch=webutil.nodebranchnodefault(fctx),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	96 parent=webutil.parents(fctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	97 child=webutil.children(fctx),
6434 62e0bb41e682 hgweb: minor improvements for new web style Matt Mackall <mpm@selenic.com> parents: 6410 diff changeset	98 rename=webutil.renamelink(fctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	99 permissions=fctx.manifest().flags(f))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	100
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	101 def file(web, req, tmpl):
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	102 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
6853 2ff0829bdae5 hgweb: do not use unassigned variables in exception handling Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6669 diff changeset	103 if not path:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	104 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	105 try:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	106 return _filerevision(web, tmpl, webutil.filectx(web.repo, req))
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	107 except error.LookupError, inst:
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	108 try:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	109 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	110 except ErrorResponse:
2ff0829bdae5 hgweb: do not use unassigned variables in exception handling Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6669 diff changeset	111 raise inst
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	112
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	113 def _search(web, req, tmpl):
19656 60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	114 MODE_REVISION = 'rev'
60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	115 MODE_KEYWORD = 'keyword'
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	116 MODE_REVSET = 'revset'
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	117
19633 217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	118 def revsearch(ctx):
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	119 yield ctx
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	120
19632 299511aabf85 hgweb: pass arguments which a function depends on explicitly in search Alexander Plavin <alexander@plav.in> parents: 19631 diff changeset	121 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	122 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	123 qw = lower(query).split()
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	124
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	125 def revgen():
18497 a58d8936647a hgweb: prevent traceback during search when filtered (issue3783) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18478 diff changeset	126 cl = web.repo.changelog
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	127 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	128 l = []
19491 e111d5e6bbbd hgweb: fix duplication for some search queries Alexander Plavin <me@aplavin.ru> parents: 19487 diff changeset	129 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	130 ctx = web.repo[j]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	131 l.append(ctx)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	132 l.reverse()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	133 for e in l:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	134 yield e
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	135
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	136 for ctx in revgen():
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	137 miss = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	138 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	139 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	140 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	141 q in lower(" ".join(ctx.files()))):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	142 miss = 1
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	143 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	144 if miss:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	145 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	146
19533 9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	147 yield ctx
9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	148
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	149 def revsetsearch(revs):
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	150 for r in revs:
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	151 yield web.repo[r]
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	152
19631 cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	153 searchfuncs = {
19656 60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	154 MODE_REVISION: revsearch,
60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	155 MODE_KEYWORD: keywordsearch,
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	156 MODE_REVSET: revsetsearch,
19631 cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	157 }
cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	158
19632 299511aabf85 hgweb: pass arguments which a function depends on explicitly in search Alexander Plavin <alexander@plav.in> parents: 19631 diff changeset	159 def getsearchmode(query):
19633 217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	160 try:
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	161 ctx = web.repo[query]
217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	162 except (error.RepoError, error.LookupError):
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	163 # query is not an exact revision pointer, need to
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	164 # decide if it's a revset expession or keywords
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	165 pass
19633 217f2b9acee0 hgweb: search() function supports direct pointing to revision Alexander Plavin <alexander@plav.in> parents: 19632 diff changeset	166 else:
19656 60ce14e41faf hgweb: add string constants for search mode names Alexander Plavin <alexander@plav.in> parents: 19634 diff changeset	167 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	168
19722 bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	169 revdef = 'reverse(%s)' % query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	170 try:
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	171 tree, pos = revset.parse(revdef)
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	172 except ParseError:
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	173 # can't parse to a revset tree
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	174 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	175
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	176 if revset.depth(tree) <= 2:
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	177 # no revset syntax used
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	178 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	179
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	180 if util.any((token, (value or '')[:3]) == ('string', 're:')
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	181 for token, value, pos in revset.tokenize(revdef)):
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	182 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	183
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	184 funcsused = revset.funcsused(tree)
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	185 if not funcsused.issubset(revset.safesymbols):
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	186 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	187
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	188 mfunc = revset.match(web.repo.ui, revdef)
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	189 try:
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	190 revs = mfunc(web.repo, list(web.repo))
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	191 return MODE_REVSET, revs
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	192 # ParseError: wrongly placed tokens, wrongs arguments, etc
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	193 # 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	194 # Abort: bookmark/tag not exists
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	195 # LookupError: ambiguous identifier, e.g. in '(bc)' on a large repo
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	196 except (ParseError, RepoLookupError, Abort, LookupError):
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	197 return MODE_KEYWORD, query
bf15935b68a3 hgweb: add revset syntax support to search Alexander Plavin <alexander@plav.in> parents: 19657 diff changeset	198
19533 9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	199 def changelist(**map):
9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	200 count = 0
9a020b354d93 hgweb: separate search itself and template generation Alexander Plavin <alexander@plav.in> parents: 19499 diff changeset	201
19632 299511aabf85 hgweb: pass arguments which a function depends on explicitly in search Alexander Plavin <alexander@plav.in> parents: 19631 diff changeset	202 for ctx in searchfunc(funcarg):
6659 bc553c6d1ef9 webcommands: fix increments lost by 894875eae49b Andrew Beekhof <beekhof@gmail.com> parents: 6657 diff changeset	203 count += 1
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	204 n = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	205 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	206 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	207
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	208 yield tmpl('searchentry',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	209 parity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	210 author=ctx.user(),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	211 parent=webutil.parents(ctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	212 child=webutil.children(ctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	213 changelogtag=showtags,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	214 desc=ctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	215 extra=ctx.extra(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	216 date=ctx.date(),
7311 de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	217 files=files,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	218 rev=ctx.rev(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	219 node=hex(n),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	220 tags=webutil.nodetagsdict(web.repo, n),
13794 5c18a0bca26f hgweb: add bookmark labels to monoblue theme (based on 270f57d35525) Yuya Nishihara <yuya@tcha.org> parents: 13597 diff changeset	221 bookmarks=webutil.nodebookmarksdict(web.repo, n),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	222 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	223 branches=webutil.nodebranchdict(web.repo, ctx))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	224
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	225 if count >= revcount:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	226 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	227
19418 55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	228 query = req.form['rev'][0]
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	229 revcount = web.maxchanges
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	230 if 'revcount' in req.form:
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	231 revcount = int(req.form.get('revcount', [revcount])[0])
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	232 revcount = max(revcount, 1)
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	233 tmpl.defaults['sessionvars']['revcount'] = revcount
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	234
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	235 lessvars = 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	236 lessvars['revcount'] = max(revcount / 2, 1)
55b9d98a1ef4 hgweb: move local changelist function to the beginning of the parent one Alexander Plavin <me@aplavin.ru> parents: 19396 diff changeset	237 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	238 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	239 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	240 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	241
19632 299511aabf85 hgweb: pass arguments which a function depends on explicitly in search Alexander Plavin <alexander@plav.in> parents: 19631 diff changeset	242 mode, funcarg = getsearchmode(query)
19631 cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	243 searchfunc = searchfuncs[mode]
cf9e5e45c1d3 hgweb: add dynamic search function selection, depending on the query Alexander Plavin <alexander@plav.in> parents: 19534 diff changeset	244
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	245 tip = web.repo['tip']
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	246 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	247
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	248 return tmpl('search', query=query, node=tip.hex(),
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	249 entries=changelist, archives=web.archivelist("tip"),
e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	250 morevars=morevars, lessvars=lessvars)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	251
10247 e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	252 def changelog(web, req, tmpl, shortlog=False):
e8c7410371e0 hgweb: add less/more links for search logs (issue1972) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10246 diff changeset	253
19396 afc23eddc324 hgweb: show current search query in the input field Alexander Plavin <me@aplavin.ru> parents: 18968 diff changeset	254 query = ''
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5890 diff changeset	255 if 'node' in req.form:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	256 ctx = webutil.changectx(web.repo, req)
19534 983bb4069004 hgweb: cleaner if conditions in changelog() function Alexander Plavin <alexander@plav.in> parents: 19533 diff changeset	257 elif 'rev' in req.form:
19634 49a068b8fb0c hgweb: always run search when a query is entered (bc) Alexander Plavin <alexander@plav.in> parents: 19633 diff changeset	258 return _search(web, req, tmpl)
19534 983bb4069004 hgweb: cleaner if conditions in changelog() function Alexander Plavin <alexander@plav.in> parents: 19533 diff changeset	259 else:
983bb4069004 hgweb: cleaner if conditions in changelog() function Alexander Plavin <alexander@plav.in> parents: 19533 diff changeset	260 ctx = web.repo['tip']
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	261
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	262 def changelist(latestonly, **map):
18427 56ca4443a343 hgweb: use changelog for iteration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18409 diff changeset	263 revs = []
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	264 if pos != -1:
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	265 revs = web.repo.changelog.revs(pos, 0)
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	266 if latestonly:
19499 81318ca090a2 hgweb: replace next(revs) to revs.next() to fix compatibility with Python 2.5- Alexander Plavin <me@aplavin.ru> parents: 19491 diff changeset	267 revs = (revs.next(),)
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	268 curcount = 0
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	269 for i in revs:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	270 ctx = web.repo[i]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	271 n = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	272 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	273 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	274
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	275 curcount += 1
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	276 if curcount > revcount:
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	277 break
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	278 yield {"parity": parity.next(),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	279 "author": ctx.user(),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	280 "parent": webutil.parents(ctx, i - 1),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	281 "child": webutil.children(ctx, i + 1),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	282 "changelogtag": showtags,
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	283 "desc": ctx.description(),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	284 "extra": ctx.extra(),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	285 "date": ctx.date(),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	286 "files": files,
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	287 "rev": i,
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	288 "node": hex(n),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	289 "tags": webutil.nodetagsdict(web.repo, n),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	290 "bookmarks": webutil.nodebookmarksdict(web.repo, n),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	291 "inbranch": webutil.nodeinbranch(web.repo, ctx),
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	292 "branches": webutil.nodebranchdict(web.repo, ctx)
002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	293 }
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	294
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	295 revcount = shortlog and web.maxshortchanges or web.maxchanges
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	296 if 'revcount' in req.form:
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	297 revcount = int(req.form.get('revcount', [revcount])[0])
13931 c3372529247f hgweb: set minimum number of revision to display to 1 when revcount is 0 Md. O. Shayan <mdoshayan@gmail.com> parents: 13924 diff changeset	298 revcount = max(revcount, 1)
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	299 tmpl.defaults['sessionvars']['revcount'] = revcount
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	300
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	301 lessvars = copy.copy(tmpl.defaults['sessionvars'])
13931 c3372529247f hgweb: set minimum number of revision to display to 1 when revcount is 0 Md. O. Shayan <mdoshayan@gmail.com> parents: 13924 diff changeset	302 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	303 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	304 morevars['revcount'] = revcount * 2
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	305
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	306 count = len(web.repo)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	307 pos = ctx.rev()
19486 002b711a3e8a hgweb: fix incorrect way to count revisions in log (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19485 diff changeset	308 parity = paritygen(web.stripecount)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	309
18409 e3f5cef11d6a hgweb: pass repo object to revnav construction Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18408 diff changeset	310 changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	311
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	312 return tmpl(shortlog and 'shortlog' or 'changelog', changenav=changenav,
14055 421d56a055fd drop {short,hex}(ctx.node()) calls in favor of ctx methods Alexander Solovyov <alexander@solovyov.net> parents: 14043 diff changeset	313 node=ctx.hex(), rev=pos, changesets=count,
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	314 entries=lambda x: changelist(latestonly=False, x),
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	315 latestentry=lambda x: changelist(latestonly=True, x),
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	316 archives=web.archivelist("tip"), revcount=revcount,
19396 afc23eddc324 hgweb: show current search query in the input field Alexander Plavin <me@aplavin.ru> parents: 18968 diff changeset	317 morevars=morevars, lessvars=lessvars, query=query)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	318
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	319 def shortlog(web, req, tmpl):
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	320 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	321
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	322 def changeset(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	323 ctx = webutil.changectx(web.repo, req)
17991 d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810) Weiwen <weiwen@fb.com> parents: 17933 diff changeset	324 basectx = webutil.basechangectx(web.repo, req)
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810) Weiwen <weiwen@fb.com> parents: 17933 diff changeset	325 if basectx is None:
d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810) Weiwen <weiwen@fb.com> parents: 17933 diff changeset	326 basectx = ctx.p1()
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	327 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
13596 270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 13199 diff changeset	328 showbookmarks = webutil.showbookmark(web.repo, tmpl, 'changesetbookmark',
270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 13199 diff changeset	329 ctx.node())
7410 f1111704061e coal/paper: show branch name in changeset view Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7409 diff changeset	330 showbranch = webutil.nodebranchnodefault(ctx)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	331
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	332 files = []
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	333 parity = paritygen(web.stripecount)
16308 2695aaf4eb72 hgweb: add block numbers to diff regions and related links Paul Boddie <paul@boddie.org.uk> parents: 16129 diff changeset	334 for blockno, f in enumerate(ctx.files()):
7182 295af5bc1bcc hgweb: remove links to non-existent file versions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7107 diff changeset	335 template = f in ctx and 'filenodelink' or 'filenolink'
295af5bc1bcc hgweb: remove links to non-existent file versions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7107 diff changeset	336 files.append(tmpl(template,
16308 2695aaf4eb72 hgweb: add block numbers to diff regions and related links Paul Boddie <paul@boddie.org.uk> parents: 16129 diff changeset	337 node=ctx.hex(), file=f, blockno=blockno + 1,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	338 parity=parity.next()))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	339
9402 5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	340 style = web.config('web', 'style', 'paper')
5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	341 if 'style' in req.form:
5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	342 style = req.form['style'][0]
5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	343
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	344 parity = paritygen(web.stripecount)
17991 d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810) Weiwen <weiwen@fb.com> parents: 17933 diff changeset	345 diffs = webutil.diffs(web.repo, tmpl, ctx, basectx, None, parity, style)
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	346
1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	347 parity = paritygen(web.stripecount)
17991 d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810) Weiwen <weiwen@fb.com> parents: 17933 diff changeset	348 diffstatgen = webutil.diffstatgen(ctx, basectx)
14570 9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14514 diff changeset	349 diffstat = webutil.diffstat(tmpl, ctx, diffstatgen, parity)
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	350
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	351 return tmpl('changeset',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	352 diff=diffs,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	353 rev=ctx.rev(),
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	354 node=ctx.hex(),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	355 parent=webutil.parents(ctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	356 child=webutil.children(ctx),
18524 66ae2ded0968 hgweb: rename 'currentbaseline' template keyword to 'basenode' Kevin Bullock <kbullock@ringworld.org> parents: 18497 diff changeset	357 basenode=basectx.hex(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	358 changesettag=showtags,
13596 270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 13199 diff changeset	359 changesetbookmark=showbookmarks,
7410 f1111704061e coal/paper: show branch name in changeset view Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7409 diff changeset	360 changesetbranch=showbranch,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	361 author=ctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	362 desc=ctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	363 extra=ctx.extra(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	364 date=ctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	365 files=files,
14570 9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14514 diff changeset	366 diffsummary=lambda **x: webutil.diffsummary(diffstatgen),
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	367 diffstat=diffstat,
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	368 archives=web.archivelist(ctx.hex()),
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	369 tags=webutil.nodetagsdict(web.repo, ctx.node()),
13596 270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 13199 diff changeset	370 bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	371 branch=webutil.nodebranchnodefault(ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	372 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	373 branches=webutil.nodebranchdict(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	374
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	375 rev = changeset
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	376
16448 e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	377 def decodepath(path):
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	378 """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	379 working copy.
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	380
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	381 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	382 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	383 return path
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	384
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	385 def manifest(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	386 ctx = webutil.changectx(web.repo, req)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	387 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	388 mf = ctx.manifest()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	389 node = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	390
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	391 files = {}
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	392 dirs = {}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	393 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	394
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	395 if path and path[-1] != "/":
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	396 path += "/"
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	397 l = len(path)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	398 abspath = "/" + path
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	399
16448 e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	400 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	401 # 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	402 # (repository) path
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	403 f = decodepath(full)
e6b45e9a75dc hgweb: add hook for remapping repository path into virtual paths Martin Geisler <mg@lazybytes.net> parents: 16308 diff changeset	404
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	405 if f[:l] != path:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	406 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	407 remain = f[l:]
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	408 elements = remain.split('/')
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	409 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	410 files[remain] = full
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	411 else:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	412 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	413 for elem in elements[0:-1]:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	414 if elem not in h:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	415 h[elem] = {}
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	416 h = h[elem]
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	417 if len(h) > 1:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	418 break
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	419 h[None] = None # denotes files present
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	420
7565 5f162f61e479 hgweb: fix problems with empty repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7434 diff changeset	421 if mf and not files and not dirs:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	422 raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	423
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	424 def filelist(**map):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7966 diff changeset	425 for f in sorted(files):
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	426 full = files[f]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	427
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	428 fctx = ctx.filectx(full)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	429 yield {"file": full,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	430 "parity": parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	431 "basename": f,
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	432 "date": fctx.date(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	433 "size": fctx.size(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	434 "permissions": mf.flags(full)}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	435
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	436 def dirlist(**map):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7966 diff changeset	437 for d in sorted(dirs):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	438
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	439 emptydirs = []
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	440 h = dirs[d]
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	441 while isinstance(h, dict) and len(h) == 1:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	442 k, v = h.items()[0]
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	443 if v:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	444 emptydirs.append(k)
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	445 h = v
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	446
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	447 path = "%s%s" % (abspath, d)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	448 yield {"parity": parity.next(),
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	449 "path": path,
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	450 "emptydirs": "/".join(emptydirs),
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	451 "basename": d}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	452
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	453 return tmpl("manifest",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	454 rev=ctx.rev(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	455 node=hex(node),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	456 path=abspath,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	457 up=webutil.up(abspath),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	458 upparity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	459 fentries=filelist,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	460 dentries=dirlist,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	461 archives=web.archivelist(hex(node)),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	462 tags=webutil.nodetagsdict(web.repo, node),
13794 5c18a0bca26f hgweb: add bookmark labels to monoblue theme (based on 270f57d35525) Yuya Nishihara <yuya@tcha.org> parents: 13597 diff changeset	463 bookmarks=webutil.nodebookmarksdict(web.repo, node),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	464 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	465 branches=webutil.nodebranchdict(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	466
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	467 def tags(web, req, tmpl):
18029 109a6a9dcca8 hgweb: fix iterator reuse in atom feed generation Matt Mackall <mpm@selenic.com> parents: 17322 diff changeset	468 i = list(reversed(web.repo.tagslist()))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	469 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	470
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	471 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	472 t = i
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	473 if notip:
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	474 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	475 if latestonly:
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	476 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	477 for k, n in t:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	478 yield {"parity": parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	479 "tag": k,
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	480 "date": web.repo[n].date(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	481 "node": hex(n)}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	482
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	483 return tmpl("tags",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	484 node=hex(web.repo.changelog.tip()),
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	485 entries=lambda x: entries(False, False, x),
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	486 entriesnotip=lambda x: entries(True, False, x),
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	487 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	488
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	489 def bookmarks(web, req, tmpl):
18478 886936ecc21b hgweb: don't attempt to show hidden bookmarks (issue3774) Kevin Bullock <kbullock@ringworld.org> parents: 18477 diff changeset	490 i = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	491 parity = paritygen(web.stripecount)
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	492
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	493 def entries(latestonly, **map):
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	494 if latestonly:
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	495 t = [min(i)]
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	496 else:
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	497 t = sorted(i)
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	498 for k, n in t:
13597 38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	499 yield {"parity": parity.next(),
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	500 "bookmark": k,
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	501 "date": web.repo[n].date(),
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	502 "node": hex(n)}
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	503
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	504 return tmpl("bookmarks",
38c9837b1f75 hgweb: add separate page with bookmarks listing Alexander Solovyov <alexander@solovyov.net> parents: 13596 diff changeset	505 node=hex(web.repo.changelog.tip()),
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	506 entries=lambda x: entries(latestonly=False, x),
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	507 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	508
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	509 def branches(web, req, tmpl):
18030 ebc0fa067c07 hgweb: avoid generator exhaustion with branches Matt Mackall <mpm@selenic.com> parents: 18029 diff changeset	510 tips = []
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	511 heads = web.repo.heads()
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	512 parity = paritygen(web.stripecount)
16720 e825a89de5d7 context: add changectx.closesbranch() method Brodie Rao <brodie@sf.io> parents: 16719 diff changeset	513 sortkey = lambda ctx: (not ctx.closesbranch(), ctx.rev())
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	514
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	515 def entries(limit, **map):
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	516 count = 0
18030 ebc0fa067c07 hgweb: avoid generator exhaustion with branches Matt Mackall <mpm@selenic.com> parents: 18029 diff changeset	517 if not tips:
ebc0fa067c07 hgweb: avoid generator exhaustion with branches Matt Mackall <mpm@selenic.com> parents: 18029 diff changeset	518 for t, n in web.repo.branchtags().iteritems():
ebc0fa067c07 hgweb: avoid generator exhaustion with branches Matt Mackall <mpm@selenic.com> parents: 18029 diff changeset	519 tips.append(web.repo[n])
8713 de6bb29e208a hgweb: allow distinction between open/closed branches on branches page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8390 diff changeset	520 for ctx in sorted(tips, key=sortkey, reverse=True):
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	521 if limit > 0 and count >= limit:
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	522 return
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	523 count += 1
14771 0cc66f13bea0 hgweb: treat branch attribute `closed' as more important than `inactive' Jesse Long <jpl@unknown.za.net> parents: 14570 diff changeset	524 if not web.repo.branchheads(ctx.branch()):
0cc66f13bea0 hgweb: treat branch attribute `closed' as more important than `inactive' Jesse Long <jpl@unknown.za.net> parents: 14570 diff changeset	525 status = 'closed'
0cc66f13bea0 hgweb: treat branch attribute `closed' as more important than `inactive' Jesse Long <jpl@unknown.za.net> parents: 14570 diff changeset	526 elif ctx.node() not in heads:
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	527 status = 'inactive'
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	528 else:
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	529 status = 'open'
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	530 yield {'parity': parity.next(),
8354 418ea63f00fb hgweb: use context api in branches webcommand Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8352 diff changeset	531 'branch': ctx.branch(),
8713 de6bb29e208a hgweb: allow distinction between open/closed branches on branches page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8390 diff changeset	532 'status': status,
8354 418ea63f00fb hgweb: use context api in branches webcommand Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8352 diff changeset	533 'node': ctx.hex(),
418ea63f00fb hgweb: use context api in branches webcommand Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8352 diff changeset	534 'date': ctx.date()}
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	535
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	536 return tmpl('branches', node=hex(web.repo.changelog.tip()),
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	537 entries=lambda x: entries(0, x),
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	538 latestentry=lambda x: entries(1, x))
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	539
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	540 def summary(web, req, tmpl):
17261 c0068b058fcd webcommands: do not modify repo.tagslist() Patrick Mezard <patrick@mezard.eu> parents: 17202 diff changeset	541 i = reversed(web.repo.tagslist())
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	542
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	543 def tagentries(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	544 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	545 count = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	546 for k, n in i:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	547 if k == "tip": # skip tip
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	548 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	549
6659 bc553c6d1ef9 webcommands: fix increments lost by 894875eae49b Andrew Beekhof <beekhof@gmail.com> parents: 6657 diff changeset	550 count += 1
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	551 if count > 10: # limit to 10 tags
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	552 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	553
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	554 yield tmpl("tagentry",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	555 parity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	556 tag=k,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	557 node=hex(n),
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	558 date=web.repo[n].date())
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	559
13924 ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	560 def bookmarks(**map):
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	561 parity = paritygen(web.stripecount)
18563 6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	562 marks = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	563 for k, n in sorted(marks)[:10]: # limit to 10 bookmarks
13924 ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	564 yield {'parity': parity.next(),
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	565 'bookmark': k,
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	566 '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	567 'node': hex(n)}
ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	568
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	569 def branches(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	570 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	571
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	572 b = web.repo.branchtags()
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7612 diff changeset	573 l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.iteritems()]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	574 for r, n, t in sorted(l):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	575 yield {'parity': parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	576 'branch': t,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	577 'node': hex(n),
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	578 'date': web.repo[n].date()}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	579
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	580 def changelist(**map):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	581 parity = paritygen(web.stripecount, offset=start - end)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	582 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	583 revs = []
6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	584 if start < end:
6d098adc5a46 hgweb: make 'summary' work with hidden changesets (issue3810) Kevin Bullock <kbullock@ringworld.org> parents: 18524 diff changeset	585 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	586 for i in revs:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	587 ctx = web.repo[i]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	588 n = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	589 hn = hex(n)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	590
18319 e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	591 l.append(tmpl(
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	592 'shortlogentry',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	593 parity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	594 author=ctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	595 desc=ctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	596 extra=ctx.extra(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	597 date=ctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	598 rev=i,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	599 node=hn,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	600 tags=webutil.nodetagsdict(web.repo, n),
13794 5c18a0bca26f hgweb: add bookmark labels to monoblue theme (based on 270f57d35525) Yuya Nishihara <yuya@tcha.org> parents: 13597 diff changeset	601 bookmarks=webutil.nodebookmarksdict(web.repo, n),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	602 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	603 branches=webutil.nodebranchdict(web.repo, ctx)))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	604
18319 e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	605 l.reverse()
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	606 yield l
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	607
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	608 tip = web.repo['tip']
0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	609 count = len(web.repo)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	610 start = max(0, count - web.maxchanges)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	611 end = min(count, start + web.maxchanges)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	612
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	613 return tmpl("summary",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	614 desc=web.config("web", "description", "unknown"),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	615 owner=get_contact(web.config) or "unknown",
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	616 lastchange=tip.date(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	617 tags=tagentries,
13924 ea726c97c1b6 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles Yuya Nishihara <yuya@tcha.org> parents: 13923 diff changeset	618 bookmarks=bookmarks,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	619 branches=branches,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	620 shortlog=changelist,
12059 0de6cfdcaad8 webcommands: remove unncessary access to repo.changelog Patrick Mezard <pmezard@gmail.com> parents: 11332 diff changeset	621 node=tip.hex(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	622 archives=web.archivelist("tip"))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	623
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	624 def filediff(web, req, tmpl):
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	625 fctx, ctx = None, None
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	626 try:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	627 fctx = webutil.filectx(web.repo, req)
7280 810ca383da9c remove unused variables Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7183 diff changeset	628 except LookupError:
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	629 ctx = webutil.changectx(web.repo, req)
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	630 path = webutil.cleanpath(web.repo, req.form['file'][0])
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	631 if path not in ctx.files():
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	632 raise
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	633
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	634 if fctx is not None:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	635 n = fctx.node()
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	636 path = fctx.path()
16722 7bf48bc7de23 hgweb: fix filediff base calculation Matt Mackall <mpm@selenic.com> parents: 16469 diff changeset	637 ctx = fctx.changectx()
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	638 else:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	639 n = ctx.node()
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	640 # path already defined in except clause
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	641
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	642 parity = paritygen(web.stripecount)
9402 5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	643 style = web.config('web', 'style', 'paper')
5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	644 if 'style' in req.form:
5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	645 style = req.form['style'][0]
5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8842 diff changeset	646
17991 d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810) Weiwen <weiwen@fb.com> parents: 17933 diff changeset	647 diffs = webutil.diffs(web.repo, tmpl, ctx, None, [path], parity, style)
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	648 rename = fctx and webutil.renamelink(fctx) or []
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	649 ctx = fctx and fctx or ctx
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	650 return tmpl("filediff",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	651 file=path,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	652 node=hex(n),
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	653 rev=ctx.rev(),
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	654 date=ctx.date(),
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	655 desc=ctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	656 extra=ctx.extra(),
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	657 author=ctx.user(),
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	658 rename=rename,
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	659 branch=webutil.nodebranchnodefault(ctx),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	660 parent=webutil.parents(ctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	661 child=webutil.children(ctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	662 diff=diffs)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	663
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	664 diff = filediff
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	665
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	666 def comparison(web, req, tmpl):
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	667 ctx = webutil.changectx(web.repo, req)
17289 f2d6b4f8e78c hgweb: avoid traceback when file or node parameters are missing Ross Lagerwall <rosslagerwall@gmail.com> parents: 17261 diff changeset	668 if 'file' not in req.form:
f2d6b4f8e78c hgweb: avoid traceback when file or node parameters are missing Ross Lagerwall <rosslagerwall@gmail.com> parents: 17261 diff changeset	669 raise ErrorResponse(HTTP_NOT_FOUND, 'file not given')
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	670 path = webutil.cleanpath(web.repo, req.form['file'][0])
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	671 rename = path in ctx and webutil.renamelink(ctx[path]) or []
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	672
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	673 parsecontext = lambda v: v == 'full' and -1 or int(v)
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	674 if 'context' in req.form:
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	675 context = parsecontext(req.form['context'][0])
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	676 else:
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	677 context = parsecontext(web.config('web', 'comparisoncontext', '5'))
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	678
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	679 def filelines(f):
19657 145636d31bb4 hgweb: import the whole util module in webcommands instead of just one function Alexander Plavin <alexander@plav.in> parents: 19656 diff changeset	680 if util.binary(f.data()):
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	681 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	682 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	683 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	684 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	685 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	686
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	687 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	688 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	689 rightrev = fctx.filerev()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	690 rightnode = fctx.filenode()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	691 rightlines = filelines(fctx)
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	692 parents = fctx.parents()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	693 if not parents:
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	694 leftrev = -1
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	695 leftnode = nullid
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	696 leftlines = ()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	697 else:
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	698 pfctx = parents[0]
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	699 leftrev = pfctx.filerev()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	700 leftnode = pfctx.filenode()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	701 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	702 else:
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	703 rightrev = -1
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	704 rightnode = nullid
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	705 rightlines = ()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	706 fctx = ctx.parents()[0][path]
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	707 leftrev = fctx.filerev()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	708 leftnode = fctx.filenode()
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	709 leftlines = filelines(fctx)
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	710
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	711 comparison = webutil.compare(tmpl, context, leftlines, rightlines)
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	712 return tmpl('filecomparison',
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	713 file=path,
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	714 node=hex(ctx.node()),
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	715 rev=ctx.rev(),
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	716 date=ctx.date(),
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	717 desc=ctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	718 extra=ctx.extra(),
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	719 author=ctx.user(),
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	720 rename=rename,
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	721 branch=webutil.nodebranchnodefault(ctx),
17303 06217d3cf8d9 hgweb: fixes invalid parents / children in comparison wujek srujek <wujek.srujek@googlemail.com> parents: 17302 diff changeset	722 parent=webutil.parents(fctx),
06217d3cf8d9 hgweb: fixes invalid parents / children in comparison wujek srujek <wujek.srujek@googlemail.com> parents: 17302 diff changeset	723 child=webutil.children(fctx),
17302 5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	724 leftrev=leftrev,
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	725 leftnode=hex(leftnode),
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	726 rightrev=rightrev,
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template wujek srujek <wujek.srujek@googlemail.com> parents: 17289 diff changeset	727 rightnode=hex(rightnode),
17202 1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	728 comparison=comparison)
1ae119269ddc hgweb: side-by-side comparison functionality wujek srujek parents: 17146 diff changeset	729
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	730 def annotate(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	731 fctx = webutil.filectx(web.repo, req)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	732 f = fctx.path()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	733 parity = paritygen(web.stripecount)
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15004 diff changeset	734 diffopts = patch.diffopts(web.repo.ui, untrusted=True, section='annotate')
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	735
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	736 def annotate(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	737 last = None
19657 145636d31bb4 hgweb: import the whole util module in webcommands instead of just one function Alexander Plavin <alexander@plav.in> parents: 19656 diff changeset	738 if util.binary(fctx.data()):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	739 mt = (mimetypes.guess_type(fctx.path())[0]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	740 or 'application/octet-stream')
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	741 lines = enumerate([((fctx.filectx(fctx.filerev()), 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	742 '(binary:%s)' % mt)])
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	743 else:
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15004 diff changeset	744 lines = enumerate(fctx.annotate(follow=True, linenumber=True,
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15004 diff changeset	745 diffopts=diffopts))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	746 for lineno, ((f, targetline), l) in lines:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	747 fnode = f.filenode()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	748
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	749 if last != fnode:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	750 last = fnode
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	751
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	752 yield {"parity": parity.next(),
14055 421d56a055fd drop {short,hex}(ctx.node()) calls in favor of ctx methods Alexander Solovyov <alexander@solovyov.net> parents: 14043 diff changeset	753 "node": f.hex(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	754 "rev": f.rev(),
6564 ccc2481e3954 webcommands: pass full author to annotate, fix templates (issue 1054) Patrick Mezard <pmezard@gmail.com> parents: 6437 diff changeset	755 "author": f.user(),
6657 a51093361e1c hgweb: show cset node and description when hovering over annotate prefix Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6564 diff changeset	756 "desc": f.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	757 "extra": f.extra(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	758 "file": f.path(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	759 "targetline": targetline,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	760 "line": l,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	761 "lineid": "l%d" % (lineno + 1),
13199 a38df1250945 hgweb: added revision date to annotate line data Oli Thissen <oli@tonick.net> parents: 12696 diff changeset	762 "linenumber": "% 6d" % (lineno + 1),
a38df1250945 hgweb: added revision date to annotate line data Oli Thissen <oli@tonick.net> parents: 12696 diff changeset	763 "revdate": f.date()}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	764
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	765 return tmpl("fileannotate",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	766 file=f,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	767 annotate=annotate,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	768 path=webutil.up(f),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	769 rev=fctx.rev(),
14055 421d56a055fd drop {short,hex}(ctx.node()) calls in favor of ctx methods Alexander Solovyov <alexander@solovyov.net> parents: 14043 diff changeset	770 node=fctx.hex(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	771 author=fctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	772 date=fctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	773 desc=fctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	774 extra=fctx.extra(),
6434 62e0bb41e682 hgweb: minor improvements for new web style Matt Mackall <mpm@selenic.com> parents: 6410 diff changeset	775 rename=webutil.renamelink(fctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	776 branch=webutil.nodebranchnodefault(fctx),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	777 parent=webutil.parents(fctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	778 child=webutil.children(fctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	779 permissions=fctx.manifest().flags(f))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	780
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	781 def filelog(web, req, tmpl):
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	782
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	783 try:
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	784 fctx = webutil.filectx(web.repo, req)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	785 f = fctx.path()
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	786 fl = fctx.filelog()
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	787 except error.LookupError:
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	788 f = webutil.cleanpath(web.repo, req.form['file'][0])
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	789 fl = web.repo.file(f)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	790 numrevs = len(fl)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	791 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	792 raise
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	793 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	794 first = fl.linkrev(0)
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	795 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	796 raise
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	797 frev = numrevs - 1
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	798 while fl.linkrev(frev) > rev:
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	799 frev -= 1
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	800 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	801
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	802 revcount = web.maxshortchanges
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	803 if 'revcount' in req.form:
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	804 revcount = int(req.form.get('revcount', [revcount])[0])
13931 c3372529247f hgweb: set minimum number of revision to display to 1 when revcount is 0 Md. O. Shayan <mdoshayan@gmail.com> parents: 13924 diff changeset	805 revcount = max(revcount, 1)
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	806 tmpl.defaults['sessionvars']['revcount'] = revcount
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	807
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	808 lessvars = copy.copy(tmpl.defaults['sessionvars'])
13931 c3372529247f hgweb: set minimum number of revision to display to 1 when revcount is 0 Md. O. Shayan <mdoshayan@gmail.com> parents: 13924 diff changeset	809 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	810 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	811 morevars['revcount'] = revcount * 2
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	812
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	813 count = fctx.filerev() + 1
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	814 start = max(0, fctx.filerev() - revcount + 1) # first rev on this page
b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	815 end = min(count, start + revcount) # last rev on this page
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	816 parity = paritygen(web.stripecount, offset=start - end)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	817
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	818 def entries(latestonly, **map):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	819 l = []
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	820
7612 069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	821 repo = web.repo
18427 56ca4443a343 hgweb: use changelog for iteration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18409 diff changeset	822 revs = repo.changelog.revs(start, end - 1)
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	823 if latestonly:
18427 56ca4443a343 hgweb: use changelog for iteration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18409 diff changeset	824 for r in revs:
56ca4443a343 hgweb: use changelog for iteration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18409 diff changeset	825 pass
56ca4443a343 hgweb: use changelog for iteration Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18409 diff changeset	826 revs = (r,)
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	827 for i in revs:
7612 069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	828 iterfctx = fctx.filectx(i)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	829
18319 e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	830 l.append({"parity": parity.next(),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	831 "filerev": i,
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	832 "file": f,
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	833 "node": iterfctx.hex(),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	834 "author": iterfctx.user(),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	835 "date": iterfctx.date(),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	836 "rename": webutil.renamelink(iterfctx),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	837 "parent": webutil.parents(iterfctx),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	838 "child": webutil.children(iterfctx),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	839 "desc": iterfctx.description(),
18581 3490c91a1fcb templates: export extra as a dict to templates Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 18563 diff changeset	840 "extra": iterfctx.extra(),
18319 e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	841 "tags": webutil.nodetagsdict(repo, iterfctx.node()),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	842 "bookmarks": webutil.nodebookmarksdict(
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	843 repo, iterfctx.node()),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	844 "branch": webutil.nodebranchnodefault(iterfctx),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	845 "inbranch": webutil.nodeinbranch(repo, iterfctx),
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	846 "branches": webutil.nodebranchdict(repo, iterfctx)})
e350ce798b63 hgweb: no do not use listinsert(0, ...) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18037 diff changeset	847 for e in reversed(l):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	848 yield e
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	849
18409 e3f5cef11d6a hgweb: pass repo object to revnav construction Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18408 diff changeset	850 revnav = webutil.filerevnav(web.repo, fctx.path())
e3f5cef11d6a hgweb: pass repo object to revnav construction Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18408 diff changeset	851 nav = revnav.gen(end - 1, revcount, count)
14055 421d56a055fd drop {short,hex}(ctx.node()) calls in favor of ctx methods Alexander Solovyov <alexander@solovyov.net> parents: 14043 diff changeset	852 return tmpl("filelog", file=f, node=fctx.hex(), nav=nav,
18402 bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	853 entries=lambda x: entries(latestonly=False, x),
bfba6d954108 hgweb: `limit` argument is actually `latestonly` renames and enforce Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18352 diff changeset	854 latestentry=lambda x: entries(latestonly=True, x),
10246 b9d02695bde4 hgweb: add less/more links to shortlog/filelog nav Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10245 diff changeset	855 revcount=revcount, morevars=morevars, lessvars=lessvars)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	856
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	857 def archive(web, req, tmpl):
6669 782dbbdfb1d7 fix traceback in hgweb when URL doesn't end in one of the archive specs Ali Saidi <saidi@eecs.umich.edu> parents: 6368 diff changeset	858 type_ = req.form.get('type', [None])[0]
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	859 allowed = web.configlist("web", "allow_archive")
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	860 key = req.form['node'][0]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	861
7029 b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	862 if type_ not in web.archives:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	863 msg = 'Unsupported archive type: %s' % type_
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	864 raise ErrorResponse(HTTP_NOT_FOUND, msg)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	865
7029 b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	866 if not ((type_ in allowed or
b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	867 web.configbool("web", "allow" + type_, False))):
b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	868 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	869 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	870
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	871 reponame = re.sub(r"\W+", "-", os.path.basename(web.reponame))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	872 cnode = web.repo.lookup(key)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	873 arch_version = key
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	874 if cnode == key or key == 'tip':
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	875 arch_version = short(cnode)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	876 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	877
bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	878 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	879 pats = []
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	880 matchfn = None
18771 bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	881 file = req.form.get('file', None)
bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	882 if file:
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	883 pats = ['path:' + file[0]]
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	884 matchfn = scmutil.match(ctx, pats, default='path')
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	885 if pats:
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	886 files = [f for f in ctx.manifest().keys() if matchfn(f)]
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	887 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	888 raise ErrorResponse(HTTP_NOT_FOUND,
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	889 'file(s) not found: %s' % file[0])
18771 bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	890
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	891 mimetype, artype, extension, encoding = web.archive_specs[type_]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	892 headers = [
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	893 ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
18347 853221386f48 hgweb: make type a mandatory parameter to request.respond Mads Kiilerich <mads@kiilerich.com> parents: 18319 diff changeset	894 ]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	895 if encoding:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	896 headers.append(('Content-Encoding', encoding))
18348 764a758780b6 hgweb: simplify wsgirequest header handling Mads Kiilerich <mads@kiilerich.com> parents: 18347 diff changeset	897 req.headers.extend(headers)
18347 853221386f48 hgweb: make type a mandatory parameter to request.respond Mads Kiilerich <mads@kiilerich.com> parents: 18319 diff changeset	898 req.respond(HTTP_OK, mimetype)
17933 8243dd66e0e3 webcommands: allow hgweb's archive to recurse into subrepos Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 17322 diff changeset	899
8243dd66e0e3 webcommands: allow hgweb's archive to recurse into subrepos Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 17322 diff changeset	900 archival.archive(web.repo, req, cnode, artype, prefix=name,
18771 bb38f4f78104 hgweb: teach archive how to download a specific directory or file Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18747 diff changeset	901 matchfn=matchfn,
17933 8243dd66e0e3 webcommands: allow hgweb's archive to recurse into subrepos Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 17322 diff changeset	902 subrepos=web.configbool("web", "archivesubrepos"))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	903 return []
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	904
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	905
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	906 def static(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	907 fname = req.form['file'][0]
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	908 # 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	909 # 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	910 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	911 if not static:
7966 aa983c3d94a9 templater: move stylemap function from hgweb to templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7876 diff changeset	912 tp = web.templatepath or templater.templatepath()
7107 125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 7102 diff changeset	913 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	914 tp = [tp]
7288 9c399c53469d Allow per-file shadowing of static directory in templatepath Brendan Cully <brendan@kublai.com> parents: 7280 diff changeset	915 static = [os.path.join(p, 'static') for p in tp]
18645 76ff3a715cf2 hgweb: simplify internal staticfile return codes Mads Kiilerich <mads@kiilerich.com> parents: 18581 diff changeset	916 staticfile(static, fname, req)
76ff3a715cf2 hgweb: simplify internal staticfile return codes Mads Kiilerich <mads@kiilerich.com> parents: 18581 diff changeset	917 return []
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	918
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	919 def graph(web, req, tmpl):
10245 207b94f6b65d hgweb: make graph page size equal to shortlog Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9404 diff changeset	920
17318 7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	921 ctx = webutil.changectx(web.repo, req)
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	922 rev = ctx.rev()
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	923
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	924 bg_height = 39
10245 207b94f6b65d hgweb: make graph page size equal to shortlog Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9404 diff changeset	925 revcount = web.maxshortchanges
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	926 if 'revcount' in req.form:
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	927 revcount = int(req.form.get('revcount', [revcount])[0])
13931 c3372529247f hgweb: set minimum number of revision to display to 1 when revcount is 0 Md. O. Shayan <mdoshayan@gmail.com> parents: 13924 diff changeset	928 revcount = max(revcount, 1)
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	929 tmpl.defaults['sessionvars']['revcount'] = revcount
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	930
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	931 lessvars = copy.copy(tmpl.defaults['sessionvars'])
13931 c3372529247f hgweb: set minimum number of revision to display to 1 when revcount is 0 Md. O. Shayan <mdoshayan@gmail.com> parents: 13924 diff changeset	932 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	933 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	934 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	935
17318 7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	936 count = len(web.repo)
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	937 pos = rev
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	938
7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	939 uprev = min(max(0, count - 1), rev + revcount)
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	940 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	941 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	942
18428 8c10f760ca34 hgweb: walk the graph through the changelog Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18427 diff changeset	943 tree = []
19487 8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	944 if pos != -1:
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	945 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	946 revs = []
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	947 for i in allrevs:
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	948 revs.append(i)
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	949 if len(revs) >= revcount:
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	950 break
8cfa3a3664a5 hgweb: fix incorrect revisions count in graph (issue3977) Alexander Plavin <me@aplavin.ru> parents: 19486 diff changeset	951
18428 8c10f760ca34 hgweb: walk the graph through the changelog Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18427 diff changeset	952 dag = graphmod.dagwalker(web.repo, revs)
8c10f760ca34 hgweb: walk the graph through the changelog Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18427 diff changeset	953 tree = list(graphmod.colored(dag, web.repo))
16773 d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	954
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	955 def getcolumns(tree):
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	956 cols = 0
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	957 for (id, type, ctx, vtx, edges) in tree:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	958 if type != graphmod.CHANGESET:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	959 continue
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	960 cols = max(cols, max([edge[0] for edge in edges] or [0]),
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	961 max([edge[1] for edge in edges] or [0]))
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	962 return cols
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	963
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	964 def graphdata(usetuples, **map):
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	965 data = []
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	966
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	967 row = 0
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	968 for (id, type, ctx, vtx, edges) in tree:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	969 if type != graphmod.CHANGESET:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	970 continue
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	971 node = str(ctx)
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	972 age = templatefilters.age(ctx.date())
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	973 desc = templatefilters.firstline(ctx.description())
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	974 desc = cgi.escape(templatefilters.nonempty(desc))
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	975 user = cgi.escape(templatefilters.person(ctx.user()))
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	976 branch = ctx.branch()
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	977 try:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	978 branchnode = web.repo.branchtip(branch)
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	979 except error.RepoLookupError:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	980 branchnode = None
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	981 branch = branch, branchnode == ctx.node()
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	982
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	983 if usetuples:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	984 data.append((node, vtx, edges, desc, user, age, branch,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	985 ctx.tags(), ctx.bookmarks()))
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	986 else:
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	987 edgedata = [dict(col=edge[0], nextcol=edge[1],
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	988 color=(edge[2] - 1) % 6 + 1,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	989 width=edge[3], bcolor=edge[4])
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	990 for edge in edges]
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	991
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	992 data.append(
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	993 dict(node=node,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	994 col=vtx[0],
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	995 color=(vtx[1] - 1) % 6 + 1,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	996 edges=edgedata,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	997 row=row,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	998 nextrow=row + 1,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	999 desc=desc,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1000 user=user,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1001 age=age,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1002 bookmarks=webutil.nodebookmarksdict(
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1003 web.repo, ctx.node()),
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1004 branches=webutil.nodebranchdict(web.repo, ctx),
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1005 inbranch=webutil.nodeinbranch(web.repo, ctx),
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1006 tags=webutil.nodetagsdict(web.repo, ctx.node())))
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1007
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1008 row += 1
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1009
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1010 return data
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1011
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1012 cols = getcolumns(tree)
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1013 rows = len(tree)
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1014 canvasheight = (rows + 1) * bg_height - 27
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1015
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	1016 return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev,
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	1017 lessvars=lessvars, morevars=morevars, downrev=downrev,
16773 d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1018 cols=cols, rows=rows,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1019 canvaswidth=(cols + 1) * bg_height,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1020 truecanvasheight=rows * bg_height,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1021 canvasheight=canvasheight, bg_height=bg_height,
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1022 jsdata=lambda x: graphdata(True, x),
d490edc71146 hgweb: make graph data suitable for template usage Paul Boddie <paul@boddie.org.uk> parents: 16727 diff changeset	1023 nodes=lambda x: graphdata(False, x),
17318 7ac5800dbc8f hgweb: fix graph view paging Patrick Mezard <patrick@mezard.eu> parents: 17303 diff changeset	1024 node=ctx.hex(), changenav=changenav)
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1025
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1026 def _getdoc(e):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1027 doc = e[0].__doc__
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1028 if doc:
16469 dd68c972d089 i18n: show localized messages for commands/extensions in hgweb help top (issue3383) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16448 diff changeset	1029 doc = _(doc).split('\n')[0]
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1030 else:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1031 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	1032 return doc
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1033
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1034 def help(web, req, tmpl):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1035 from mercurial import commands # avoid cycle
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1036
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1037 topicname = req.form.get('node', [None])[0]
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1038 if not topicname:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1039 def topics(**map):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1040 for entries, summary, _ 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	1041 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	1042
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1043 early, other = [], []
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1044 primary = lambda s: s.split('\|')[0]
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1045 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	1046 doc = _getdoc(e)
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1047 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	1048 continue
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1049 cmd = primary(c)
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1050 if cmd.startswith('^'):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1051 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	1052 else:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1053 other.append((cmd, doc))
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1054
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1055 early.sort()
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1056 other.sort()
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1057
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1058 def earlycommands(**map):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1059 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	1060 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	1061
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1062 def othercommands(**map):
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1063 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	1064 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	1065
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1066 return tmpl('helptopics', topics=topics, earlycommands=earlycommands,
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1067 othercommands=othercommands, title='Index')
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1068
12696 ef969e58a394 hgweb: another fix for the help termwidth bug Matt Mackall <mpm@selenic.com> parents: 12692 diff changeset	1069 u = webutil.wsgiui()
17146 6b40cc67ceb4 hgweb: show help with verbose sections included Adrian Buehlmann <adrian@cadifra.com> parents: 16773 diff changeset	1070 u.verbose = True
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1071 try:
18747 f5db3092790f hgweb: generate HTML documentation Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 18645 diff changeset	1072 doc = helpmod.help_(u, topicname)
12666 ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1073 except error.UnknownCommand:
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1074 raise ErrorResponse(HTTP_NOT_FOUND)
ead4e21f49f1 web: add a help view for getting hg help output Augie Fackler <durin42@gmail.com> parents: 12063 diff changeset	1075 return tmpl('help', topic=topicname, doc=doc)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb/webcommands.py @ 19722:bf15935b68a3