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

annotate mercurial/hgweb/webcommands.py @ 8842:acd03a6e2426

graphmod/webcommands: use generic DAG walks Changes graph() to colorededges(), which operates on the new generic DAG walks and adds color and edge information needed by the web graph. This is in preparation of adding DAG walk filters, like the linear run collapser in the next patch. The idea is to have a bunch of changelog walkers that return basic data. Then we can filter this data. Finally we add edge and formatting info suitable for the output media we want to target (glog, hgweb).

author	Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date	Fri, 19 Jun 2009 13:44:23 +0200
parents	2bcef677a6c3
children	31177742f54a 5d49fdef6fd0

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
46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	6 # GNU General Public License version 2, incorporated herein by reference.
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
7966 aa983c3d94a9 templater: move stylemap function from hgweb to templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7876 diff changeset	10 from mercurial import error, archival, templater, templatefilters
7873 4a4c7f6a5912 cleanup: drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7671 diff changeset	11 from mercurial.node import short, hex
4a4c7f6a5912 cleanup: drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7671 diff changeset	12 from mercurial.util import binary
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
8390 beae42f3d93b drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8354 diff changeset	15 from mercurial import graphmod
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	16
5963 5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	17 # __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	18 # 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	19
5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	20 __all__ = [
5be210afe1b8 hgweb: explicitly check if requested command exists Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5960 diff changeset	21 'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev',
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	22 'manifest', 'tags', 'branches', 'summary', 'filediff', 'diff', 'annotate',
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	23 'filelog', 'archive', 'static', 'graph',
5963 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
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	26 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	27 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	28 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	29 else:
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	30 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	31
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	32 def rawfile(web, req, tmpl):
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	33 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	34 if not path:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	35 content = manifest(web, req, tmpl)
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5964 diff changeset	36 req.respond(HTTP_OK, web.ctype)
948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5964 diff changeset	37 return content
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	38
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	39 try:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	40 fctx = webutil.filectx(web.repo, req)
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	41 except error.LookupError, inst:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	42 try:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	43 content = manifest(web, req, tmpl)
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	44 req.respond(HTTP_OK, web.ctype)
2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	45 return content
2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	46 except ErrorResponse:
2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6217 diff changeset	47 raise inst
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	48
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	49 path = fctx.path()
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	50 text = fctx.data()
a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	51 mt = mimetypes.guess_type(path)[0]
6981 029a54423a96 hgweb: Serve raw non-binary files as text/plain Rocco Rutte <pdmef@gmx.net> parents: 6857 diff changeset	52 if mt is None:
029a54423a96 hgweb: Serve raw non-binary files as text/plain Rocco Rutte <pdmef@gmx.net> parents: 6857 diff changeset	53 mt = binary(text) and 'application/octet-stream' or 'text/plain'
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	54
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5964 diff changeset	55 req.respond(HTTP_OK, mt, path, len(text))
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	56 return [text]
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5600 diff changeset	57
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	58 def _filerevision(web, tmpl, fctx):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	59 f = fctx.path()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	60 text = fctx.data()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	61 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	62
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	63 if binary(text):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	64 mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	65 text = '(binary:%s)' % mt
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	66
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	67 def lines():
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	68 for lineno, t in enumerate(text.splitlines(1)):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	69 yield {"line": t,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	70 "lineid": "l%d" % (lineno + 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	71 "linenumber": "% 6d" % (lineno + 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	72 "parity": parity.next()}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	73
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	74 return tmpl("filerevision",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	75 file=f,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	76 path=webutil.up(f),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	77 text=lines(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	78 rev=fctx.rev(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	79 node=hex(fctx.node()),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	80 author=fctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	81 date=fctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	82 desc=fctx.description(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	83 branch=webutil.nodebranchnodefault(fctx),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	84 parent=webutil.parents(fctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	85 child=webutil.children(fctx),
6434 62e0bb41e682 hgweb: minor improvements for new web style Matt Mackall <mpm@selenic.com> parents: 6410 diff changeset	86 rename=webutil.renamelink(fctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	87 permissions=fctx.manifest().flags(f))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	88
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	89 def file(web, req, tmpl):
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	90 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	91 if not path:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	92 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	93 try:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	94 return _filerevision(web, tmpl, webutil.filectx(web.repo, req))
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	95 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	96 try:
6857 e8c2dae47799 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6762 6853 diff changeset	97 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	98 except ErrorResponse:
2ff0829bdae5 hgweb: do not use unassigned variables in exception handling Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6669 diff changeset	99 raise inst
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	100
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	101 def _search(web, tmpl, query):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	102
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	103 def changelist(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	104 cl = web.repo.changelog
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	105 count = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	106 qw = query.lower().split()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	107
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	108 def revgen():
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	109 for i in xrange(len(cl) - 1, 0, -100):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	110 l = []
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	111 for j in xrange(max(0, i - 100), i + 1):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	112 ctx = web.repo[j]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	113 l.append(ctx)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	114 l.reverse()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	115 for e in l:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	116 yield e
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	117
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	118 for ctx in revgen():
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	119 miss = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	120 for q in qw:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	121 if not (q in ctx.user().lower() or
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	122 q in ctx.description().lower() or
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	123 q in " ".join(ctx.files()).lower()):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	124 miss = 1
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	125 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	126 if miss:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	127 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	128
6659 bc553c6d1ef9 webcommands: fix increments lost by 894875eae49b Andrew Beekhof <beekhof@gmail.com> parents: 6657 diff changeset	129 count += 1
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	130 n = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	131 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	132 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	133
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	134 yield tmpl('searchentry',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	135 parity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	136 author=ctx.user(),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	137 parent=webutil.parents(ctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	138 child=webutil.children(ctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	139 changelogtag=showtags,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	140 desc=ctx.description(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	141 date=ctx.date(),
7311 de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	142 files=files,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	143 rev=ctx.rev(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	144 node=hex(n),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	145 tags=webutil.nodetagsdict(web.repo, n),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	146 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	147 branches=webutil.nodebranchdict(web.repo, ctx))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	148
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	149 if count >= web.maxchanges:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	150 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	151
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	152 cl = web.repo.changelog
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	153 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	154
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	155 return tmpl('search',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	156 query=query,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	157 node=hex(cl.tip()),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	158 entries=changelist,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	159 archives=web.archivelist("tip"))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	160
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	161 def changelog(web, req, tmpl, shortlog = False):
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5890 diff changeset	162 if 'node' in req.form:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	163 ctx = webutil.changectx(web.repo, req)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	164 else:
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5890 diff changeset	165 if 'rev' in req.form:
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	166 hi = req.form['rev'][0]
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	167 else:
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	168 hi = len(web.repo) - 1
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	169 try:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	170 ctx = web.repo[hi]
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	171 except error.RepoError:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	172 return _search(web, tmpl, hi) # XXX redirect to 404 page?
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	173
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	174 def changelist(limit=0, **map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	175 l = [] # build a list in forward order for efficiency
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	176 for i in xrange(start, end):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	177 ctx = web.repo[i]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	178 n = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	179 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	180 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	181
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	182 l.insert(0, {"parity": parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	183 "author": ctx.user(),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	184 "parent": webutil.parents(ctx, i - 1),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	185 "child": webutil.children(ctx, i + 1),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	186 "changelogtag": showtags,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	187 "desc": ctx.description(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	188 "date": ctx.date(),
7311 de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	189 "files": files,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	190 "rev": i,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	191 "node": hex(n),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	192 "tags": webutil.nodetagsdict(web.repo, n),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	193 "inbranch": webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	194 "branches": webutil.nodebranchdict(web.repo, ctx)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	195 })
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	196
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	197 if limit > 0:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	198 l = l[:limit]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	199
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	200 for e in l:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	201 yield e
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	202
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	203 maxchanges = shortlog and web.maxshortchanges or web.maxchanges
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	204 cl = web.repo.changelog
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	205 count = len(cl)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	206 pos = ctx.rev()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	207 start = max(0, pos - maxchanges + 1)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	208 end = min(count, start + maxchanges)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	209 pos = end - 1
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	210 parity = paritygen(web.stripecount, offset=start-end)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	211
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	212 changenav = webutil.revnavgen(pos, maxchanges, count, web.repo.changectx)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	213
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	214 return tmpl(shortlog and 'shortlog' or 'changelog',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	215 changenav=changenav,
6434 62e0bb41e682 hgweb: minor improvements for new web style Matt Mackall <mpm@selenic.com> parents: 6410 diff changeset	216 node=hex(ctx.node()),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	217 rev=pos, changesets=count,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	218 entries=lambda x: changelist(limit=0,x),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	219 latestentry=lambda x: changelist(limit=1,x),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	220 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	221
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	222 def shortlog(web, req, tmpl):
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	223 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	224
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	225 def changeset(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	226 ctx = webutil.changectx(web.repo, req)
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	227 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
7410 f1111704061e coal/paper: show branch name in changeset view Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7409 diff changeset	228 showbranch = webutil.nodebranchnodefault(ctx)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	229
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	230 files = []
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	231 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	232 for f in ctx.files():
7182 295af5bc1bcc hgweb: remove links to non-existent file versions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7107 diff changeset	233 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	234 files.append(tmpl(template,
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	235 node=ctx.hex(), file=f,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	236 parity=parity.next()))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	237
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	238 parity = paritygen(web.stripecount)
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	239 diffs = webutil.diffs(web.repo, tmpl, ctx, None, parity)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	240 return tmpl('changeset',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	241 diff=diffs,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	242 rev=ctx.rev(),
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	243 node=ctx.hex(),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	244 parent=webutil.parents(ctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	245 child=webutil.children(ctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	246 changesettag=showtags,
7410 f1111704061e coal/paper: show branch name in changeset view Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7409 diff changeset	247 changesetbranch=showbranch,
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	248 author=ctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	249 desc=ctx.description(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	250 date=ctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	251 files=files,
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	252 archives=web.archivelist(ctx.hex()),
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	253 tags=webutil.nodetagsdict(web.repo, ctx.node()),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	254 branch=webutil.nodebranchnodefault(ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	255 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	256 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	257
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	258 rev = changeset
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	259
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	260 def manifest(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	261 ctx = webutil.changectx(web.repo, req)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	262 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	263 mf = ctx.manifest()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	264 node = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	265
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	266 files = {}
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	267 dirs = {}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	268 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	269
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	270 if path and path[-1] != "/":
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	271 path += "/"
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	272 l = len(path)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	273 abspath = "/" + path
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	274
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7612 diff changeset	275 for f, n in mf.iteritems():
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	276 if f[:l] != path:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	277 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	278 remain = f[l:]
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	279 elements = remain.split('/')
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	280 if len(elements) == 1:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	281 files[remain] = f
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	282 else:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	283 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	284 for elem in elements[0:-1]:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	285 if elem not in h:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	286 h[elem] = {}
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	287 h = h[elem]
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	288 if len(h) > 1:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	289 break
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	290 h[None] = None # denotes files present
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	291
7565 5f162f61e479 hgweb: fix problems with empty repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7434 diff changeset	292 if mf and not files and not dirs:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	293 raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	294
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	295 def filelist(**map):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7966 diff changeset	296 for f in sorted(files):
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	297 full = files[f]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	298
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	299 fctx = ctx.filectx(full)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	300 yield {"file": full,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	301 "parity": parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	302 "basename": f,
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	303 "date": fctx.date(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	304 "size": fctx.size(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	305 "permissions": mf.flags(full)}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	306
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	307 def dirlist(**map):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7966 diff changeset	308 for d in sorted(dirs):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	309
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	310 emptydirs = []
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	311 h = dirs[d]
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	312 while isinstance(h, dict) and len(h) == 1:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	313 k,v = h.items()[0]
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	314 if v:
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	315 emptydirs.append(k)
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	316 h = v
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	317
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	318 path = "%s%s" % (abspath, d)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	319 yield {"parity": parity.next(),
7305 c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	320 "path": path,
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	321 "emptydirs": "/".join(emptydirs),
c21d236ca897 hgweb: descend empty directories in web view Ry4an Brase <ry4an-hg@ry4an.org> parents: 7300 diff changeset	322 "basename": d}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	323
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	324 return tmpl("manifest",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	325 rev=ctx.rev(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	326 node=hex(node),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	327 path=abspath,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	328 up=webutil.up(abspath),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	329 upparity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	330 fentries=filelist,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	331 dentries=dirlist,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	332 archives=web.archivelist(hex(node)),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	333 tags=webutil.nodetagsdict(web.repo, node),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	334 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	335 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	336
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	337 def tags(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	338 i = web.repo.tagslist()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	339 i.reverse()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	340 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	341
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	342 def entries(notip=False,limit=0, **map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	343 count = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	344 for k, n in i:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	345 if notip and k == "tip":
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	346 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	347 if limit > 0 and count >= limit:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	348 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	349 count = count + 1
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	350 yield {"parity": parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	351 "tag": k,
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	352 "date": web.repo[n].date(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	353 "node": hex(n)}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	354
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	355 return tmpl("tags",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	356 node=hex(web.repo.changelog.tip()),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	357 entries=lambda x: entries(False,0, x),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	358 entriesnotip=lambda x: entries(True,0, x),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	359 latestentry=lambda x: entries(True,1, x))
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	360
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	361 def branches(web, req, tmpl):
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	362 b = web.repo.branchtags()
8354 418ea63f00fb hgweb: use context api in branches webcommand Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8352 diff changeset	363 tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems())
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	364 heads = web.repo.heads()
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	365 parity = paritygen(web.stripecount)
8713 de6bb29e208a hgweb: allow distinction between open/closed branches on branches page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8390 diff changeset	366 sortkey = lambda ctx: ('close' not in ctx.extra(), ctx.rev())
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	367
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	368 def entries(limit, **map):
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	369 count = 0
8713 de6bb29e208a hgweb: allow distinction between open/closed branches on branches page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8390 diff changeset	370 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	371 if limit > 0 and count >= limit:
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	372 return
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	373 count += 1
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	374 if ctx.node() not in heads:
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	375 status = 'inactive'
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	376 elif not web.repo.branchheads(ctx.branch()):
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	377 status = 'closed'
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	378 else:
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8713 diff changeset	379 status = 'open'
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	380 yield {'parity': parity.next(),
8354 418ea63f00fb hgweb: use context api in branches webcommand Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8352 diff changeset	381 'branch': ctx.branch(),
8713 de6bb29e208a hgweb: allow distinction between open/closed branches on branches page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8390 diff changeset	382 'status': status,
8354 418ea63f00fb hgweb: use context api in branches webcommand Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8352 diff changeset	383 'node': ctx.hex(),
418ea63f00fb hgweb: use context api in branches webcommand Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8352 diff changeset	384 'date': ctx.date()}
8352 eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	385
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	386 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	387 entries=lambda x: entries(0, x),
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	388 latestentry=lambda x: entries(1, x))
eefcb59d44d6 webcommands: add 'branches' command, similar to 'tags' Sune Foldager <cryo@cyanite.org> parents: 8236 diff changeset	389
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	390 def summary(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	391 i = web.repo.tagslist()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	392 i.reverse()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	393
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	394 def tagentries(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	395 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	396 count = 0
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	397 for k, n in i:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	398 if k == "tip": # skip tip
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	399 continue
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	400
6659 bc553c6d1ef9 webcommands: fix increments lost by 894875eae49b Andrew Beekhof <beekhof@gmail.com> parents: 6657 diff changeset	401 count += 1
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	402 if count > 10: # limit to 10 tags
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	403 break
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	404
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	405 yield tmpl("tagentry",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	406 parity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	407 tag=k,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	408 node=hex(n),
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	409 date=web.repo[n].date())
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	410
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	411 def branches(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	412 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	413
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	414 b = web.repo.branchtags()
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7612 diff changeset	415 l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.iteritems()]
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7966 diff changeset	416 for r,n,t in sorted(l):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	417 yield {'parity': parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	418 'branch': t,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	419 'node': hex(n),
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	420 'date': web.repo[n].date()}
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	421
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	422 def changelist(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	423 parity = paritygen(web.stripecount, offset=start-end)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	424 l = [] # build a list in forward order for efficiency
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	425 for i in xrange(start, end):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6720 diff changeset	426 ctx = web.repo[i]
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	427 n = ctx.node()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	428 hn = hex(n)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	429
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	430 l.insert(0, tmpl(
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	431 'shortlogentry',
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	432 parity=parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	433 author=ctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	434 desc=ctx.description(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	435 date=ctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	436 rev=i,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	437 node=hn,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	438 tags=webutil.nodetagsdict(web.repo, n),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	439 inbranch=webutil.nodeinbranch(web.repo, ctx),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	440 branches=webutil.nodebranchdict(web.repo, ctx)))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	441
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	442 yield l
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	443
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	444 cl = web.repo.changelog
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	445 count = len(cl)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	446 start = max(0, count - web.maxchanges)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	447 end = min(count, start + web.maxchanges)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	448
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	449 return tmpl("summary",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	450 desc=web.config("web", "description", "unknown"),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	451 owner=get_contact(web.config) or "unknown",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	452 lastchange=cl.read(cl.tip())[2],
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	453 tags=tagentries,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	454 branches=branches,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	455 shortlog=changelist,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	456 node=hex(cl.tip()),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	457 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	458
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	459 def filediff(web, req, tmpl):
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	460 fctx, ctx = None, None
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	461 try:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	462 fctx = webutil.filectx(web.repo, req)
7280 810ca383da9c remove unused variables Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7183 diff changeset	463 except LookupError:
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	464 ctx = webutil.changectx(web.repo, req)
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	465 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	466 if path not in ctx.files():
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	467 raise
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	468
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	469 if fctx is not None:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	470 n = fctx.node()
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	471 path = fctx.path()
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	472 else:
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	473 n = ctx.node()
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	474 # path already defined in except clause
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	475
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	476 parity = paritygen(web.stripecount)
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7305 diff changeset	477 diffs = webutil.diffs(web.repo, tmpl, fctx or ctx, [path], parity)
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	478 rename = fctx and webutil.renamelink(fctx) or []
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	479 ctx = fctx and fctx or ctx
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	480 return tmpl("filediff",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	481 file=path,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	482 node=hex(n),
7183 099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	483 rev=ctx.rev(),
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	484 date=ctx.date(),
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	485 desc=ctx.description(),
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	486 author=ctx.user(),
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	487 rename=rename,
099b4f9be5ab hgweb: working diff for removed files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7182 diff changeset	488 branch=webutil.nodebranchnodefault(ctx),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	489 parent=webutil.parents(ctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	490 child=webutil.children(ctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	491 diff=diffs)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	492
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	493 diff = filediff
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	494
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	495 def annotate(web, req, tmpl):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	496 fctx = webutil.filectx(web.repo, req)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	497 f = fctx.path()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	498 parity = paritygen(web.stripecount)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	499
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	500 def annotate(**map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	501 last = None
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	502 if binary(fctx.data()):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	503 mt = (mimetypes.guess_type(fctx.path())[0]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	504 or 'application/octet-stream')
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	505 lines = enumerate([((fctx.filectx(fctx.filerev()), 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	506 '(binary:%s)' % mt)])
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	507 else:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	508 lines = enumerate(fctx.annotate(follow=True, linenumber=True))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	509 for lineno, ((f, targetline), l) in lines:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	510 fnode = f.filenode()
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	511
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	512 if last != fnode:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	513 last = fnode
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	514
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	515 yield {"parity": parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	516 "node": hex(f.node()),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	517 "rev": f.rev(),
6564 ccc2481e3954 webcommands: pass full author to annotate, fix templates (issue 1054) Patrick Mezard <pmezard@gmail.com> parents: 6437 diff changeset	518 "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	519 "desc": f.description(),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	520 "file": f.path(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	521 "targetline": targetline,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	522 "line": l,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	523 "lineid": "l%d" % (lineno + 1),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	524 "linenumber": "% 6d" % (lineno + 1)}
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	525
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	526 return tmpl("fileannotate",
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	527 file=f,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	528 annotate=annotate,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	529 path=webutil.up(f),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	530 rev=fctx.rev(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	531 node=hex(fctx.node()),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	532 author=fctx.user(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	533 date=fctx.date(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	534 desc=fctx.description(),
6434 62e0bb41e682 hgweb: minor improvements for new web style Matt Mackall <mpm@selenic.com> parents: 6410 diff changeset	535 rename=webutil.renamelink(fctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	536 branch=webutil.nodebranchnodefault(fctx),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	537 parent=webutil.parents(fctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	538 child=webutil.children(fctx),
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	539 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	540
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	541 def filelog(web, req, tmpl):
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	542
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	543 try:
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	544 fctx = webutil.filectx(web.repo, req)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	545 f = fctx.path()
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	546 fl = fctx.filelog()
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	547 except error.LookupError:
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	548 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	549 fl = web.repo.file(f)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	550 numrevs = len(fl)
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	551 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	552 raise
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	553 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	554 first = fl.linkrev(0)
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	555 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	556 raise
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	557 frev = numrevs - 1
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	558 while fl.linkrev(frev) > rev:
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	559 frev -= 1
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	560 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	561
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	562 count = fctx.filerev() + 1
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	563 pagelen = web.maxshortchanges
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	564 start = max(0, fctx.filerev() - pagelen + 1) # first rev on this page
591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	565 end = min(count, start + pagelen) # last rev on this page
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	566 parity = paritygen(web.stripecount, offset=start-end)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	567
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	568 def entries(limit=0, **map):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	569 l = []
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	570
7612 069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	571 repo = web.repo
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	572 for i in xrange(start, end):
7612 069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	573 iterfctx = fctx.filectx(i)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	574
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	575 l.insert(0, {"parity": parity.next(),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	576 "filerev": i,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	577 "file": f,
7612 069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	578 "node": hex(iterfctx.node()),
069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	579 "author": iterfctx.user(),
069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	580 "date": iterfctx.date(),
069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	581 "rename": webutil.renamelink(iterfctx),
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	582 "parent": webutil.parents(iterfctx),
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	583 "child": webutil.children(iterfctx),
7612 069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	584 "desc": iterfctx.description(),
069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	585 "tags": webutil.nodetagsdict(repo, iterfctx.node()),
069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	586 "branch": webutil.nodebranchnodefault(iterfctx),
069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	587 "inbranch": webutil.nodeinbranch(repo, iterfctx),
069b29656401 web: use the correct filectx in filelog Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7565 diff changeset	588 "branches": webutil.nodebranchdict(repo, iterfctx)})
7434 cf7741aa1e96 kill some trailing spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7410 diff changeset	589
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	590 if limit > 0:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	591 l = l[:limit]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	592
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	593 for e in l:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	594 yield e
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	595
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	596 nodefunc = lambda x: fctx.filectx(fileid=x)
7300 591767e6ea7a hgweb: conditionally show file logs for deleted files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7288 diff changeset	597 nav = webutil.revnavgen(end - 1, pagelen, count, nodefunc)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	598 return tmpl("filelog", file=f, node=hex(fctx.node()), nav=nav,
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	599 entries=lambda x: entries(limit=0, x),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	600 latestentry=lambda x: entries(limit=1, x))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	601
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	602
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	603 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	604 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	605 allowed = web.configlist("web", "allow_archive")
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	606 key = req.form['node'][0]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	607
7029 b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	608 if type_ not in web.archives:
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	609 msg = 'Unsupported archive type: %s' % type_
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	610 raise ErrorResponse(HTTP_NOT_FOUND, msg)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	611
7029 b84d27386285 hgweb: Respond with HTTP 403 for disabled archive types instead of 404 Rocco Rutte <pdmef@gmx.net> parents: 6981 diff changeset	612 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	613 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	614 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	615 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	616
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	617 reponame = re.sub(r"\W+", "-", os.path.basename(web.reponame))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	618 cnode = web.repo.lookup(key)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	619 arch_version = key
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	620 if cnode == key or key == 'tip':
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	621 arch_version = short(cnode)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	622 name = "%s-%s" % (reponame, arch_version)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	623 mimetype, artype, extension, encoding = web.archive_specs[type_]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	624 headers = [
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	625 ('Content-Type', mimetype),
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	626 ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	627 ]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	628 if encoding:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	629 headers.append(('Content-Encoding', encoding))
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	630 req.header(headers)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	631 req.respond(HTTP_OK)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	632 archival.archive(web.repo, req, cnode, artype, prefix=name)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	633 return []
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	634
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	635
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	636 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	637 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	638 # 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	639 # 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	640 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	641 if not static:
7966 aa983c3d94a9 templater: move stylemap function from hgweb to templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7876 diff changeset	642 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	643 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	644 tp = [tp]
7288 9c399c53469d Allow per-file shadowing of static directory in templatepath Brendan Cully <brendan@kublai.com> parents: 7280 diff changeset	645 static = [os.path.join(p, 'static') for p in tp]
5964 1cd1582ef25f hgweb: centralize req.write() calls Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5963 diff changeset	646 return [staticfile(static, fname, req)]
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	647
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	648 def graph(web, req, tmpl):
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	649 rev = webutil.changectx(web.repo, req).rev()
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	650 bg_height = 39
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	651
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	652 revcount = 25
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	653 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	654 revcount = int(req.form.get('revcount', [revcount])[0])
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	655 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	656
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	657 lessvars = 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	658 lessvars['revcount'] = revcount / 2
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	659 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	660 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	661
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	662 max_rev = len(web.repo) - 1
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	663 revcount = min(max_rev, revcount)
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	664 revnode = web.repo.changelog.node(rev)
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	665 revnode_hex = hex(revnode)
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	666 uprev = min(max_rev, rev + revcount)
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	667 downrev = max(0, rev - revcount)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	668 count = len(web.repo)
7332 5c95d7667dd1 hgweb: fix pagination for graph Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	669 changenav = webutil.revnavgen(rev, revcount, count, web.repo.changectx)
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	670
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8796 diff changeset	671 dag = graphmod.revisions(web.repo, rev, downrev)
acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8796 diff changeset	672 tree = list(graphmod.colored(dag))
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	673 canvasheight = (len(tree) + 1) * bg_height - 27;
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	674 data = []
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8796 diff changeset	675 for (id, type, ctx, vtx, edges) in tree:
acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8796 diff changeset	676 if type != graphmod.CHANGESET:
acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8796 diff changeset	677 continue
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	678 node = short(ctx.node())
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	679 age = templatefilters.age(ctx.date())
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	680 desc = templatefilters.firstline(ctx.description())
8236 9f53e203a09b webcommands: move nonempty logic from JavaScript to Python Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	681 desc = cgi.escape(templatefilters.nonempty(desc))
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	682 user = cgi.escape(templatefilters.person(ctx.user()))
6720 084c9f1ef2bd graph: display branch name alongside tags Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6704 diff changeset	683 branch = ctx.branch()
084c9f1ef2bd graph: display branch name alongside tags Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6704 diff changeset	684 branch = branch, web.repo.branchtags().get(branch) == ctx.node()
084c9f1ef2bd graph: display branch name alongside tags Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6704 diff changeset	685 data.append((node, vtx, edges, desc, user, age, branch, ctx.tags()))
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	686
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6670 diff changeset	687 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	688 lessvars=lessvars, morevars=morevars, downrev=downrev,
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	689 canvasheight=canvasheight, jsdata=data, bg_height=bg_height,
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7332 diff changeset	690 node=revnode_hex, changenav=changenav)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb/webcommands.py @ 8842:acd03a6e2426