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

annotate mercurial/hgweb/webutil.py @ 14570:9f908ef5a595

web: provide diff summary to the changeset page This is the same message displayed at the end of the "diff --stat" command. For example, "9 files changed, 1651 insertions(+), 2 deletions(-)". The webutil.diffstatgen function allows the diffstat data to be lazily calculated only once and then re-used.

author	Steven Brown <StevenGBrown@gmail.com>
date	Sat, 11 Jun 2011 21:11:43 +0800
parents	fccd3b966da7
children	16e5271b216f

rev	line source
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1 # hgweb/webutil.py - utility library for the web interface.
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	2 #
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	5 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7717 diff changeset	6 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9402 diff changeset	7 # GNU General Public License version 2 or any later version.
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	8
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	9 import os, copy
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	10 from mercurial import match, patch, scmutil, error, ui, util
14570 9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	11 from mercurial.i18n import _
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	12 from mercurial.node import hex, nullid
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	13
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	14 def up(p):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	15 if p[0] != "/":
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	16 p = "/" + p
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	17 if p[-1] == "/":
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	18 p = p[:-1]
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	19 up = os.path.dirname(p)
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	20 if up == "/":
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	21 return "/"
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	22 return up + "/"
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	23
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	24 def revnavgen(pos, pagelen, limit, nodefunc):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	25 def seq(factor, limit=None):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	26 if limit:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	27 yield limit
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	28 if limit >= 20 and limit <= 40:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	29 yield 50
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	30 else:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	31 yield 1 * factor
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	32 yield 3 * factor
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	33 for f in seq(factor * 10):
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	34 yield f
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	35
10254 8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	36 navbefore = []
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	37 navafter = []
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	38
10254 8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	39 last = 0
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	40 for f in seq(1, pagelen):
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	41 if f < pagelen or f <= last:
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	42 continue
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	43 if f > limit:
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	44 break
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	45 last = f
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	46 if pos + f < limit:
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	47 navafter.append(("+%d" % f, hex(nodefunc(pos + f).node())))
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	48 if pos - f >= 0:
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	49 navbefore.insert(0, ("-%d" % f, hex(nodefunc(pos - f).node())))
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	50
10254 8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	51 navafter.append(("tip", "tip"))
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	52 try:
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	53 navbefore.insert(0, ("(0)", hex(nodefunc('0').node())))
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	54 except error.RepoError:
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	55 pass
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	56
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	57 def gen(l):
8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	58 def f(**map):
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	59 for label, node in l:
894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	60 yield {"label": label, "node": node}
10254 8d5de52431f2 hgweb: changenav: separate pages before and after the current position Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9402 diff changeset	61 return f
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	62
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	63 return (dict(before=gen(navbefore), after=gen(navafter)),)
6393 894875eae49b hgweb: refactor hgweb code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6392 diff changeset	64
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	65 def _siblings(siblings=[], hiderev=None):
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	66 siblings = [s for s in siblings if s.node() != nullid]
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	67 if len(siblings) == 1 and siblings[0].rev() == hiderev:
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	68 return
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	69 for s in siblings:
14055 421d56a055fd drop {short,hex}(ctx.node()) calls in favor of ctx methods Alexander Solovyov <alexander@solovyov.net> parents: 13971 diff changeset	70 d = {'node': s.hex(), 'rev': s.rev()}
7294 f933076a19fc hgweb: pass more information about parent/child csets to templates Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6750 diff changeset	71 d['user'] = s.user()
f933076a19fc hgweb: pass more information about parent/child csets to templates Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6750 diff changeset	72 d['date'] = s.date()
f933076a19fc hgweb: pass more information about parent/child csets to templates Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6750 diff changeset	73 d['description'] = s.description()
7717 f9ba30cb7ee4 hgweb: expose sibling branches to templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7671 diff changeset	74 d['branch'] = s.branch()
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	75 if hasattr(s, 'path'):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	76 d['file'] = s.path()
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	77 yield d
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	78
7671 06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	79 def parents(ctx, hide=None):
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	80 return _siblings(ctx.parents(), hide)
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	81
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	82 def children(ctx, hide=None):
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	83 return _siblings(ctx.children(), hide)
06cf09c822c4 hgweb: simplify parents/children generation code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	84
6434 62e0bb41e682 hgweb: minor improvements for new web style Matt Mackall <mpm@selenic.com> parents: 6413 diff changeset	85 def renamelink(fctx):
6437 101526031d06 hgweb: fix merge breakage Matt Mackall <mpm@selenic.com> parents: 6434 diff changeset	86 r = fctx.renamed()
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	87 if r:
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	88 return [dict(file=r[0], node=hex(r[1]))]
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	89 return []
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	90
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	91 def nodetagsdict(repo, node):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	92 return [{"name": i} for i in repo.nodetags(node)]
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	93
13596 270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 12691 diff changeset	94 def nodebookmarksdict(repo, node):
270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 12691 diff changeset	95 return [{"name": i} for i in repo.nodebookmarks(node)]
270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 12691 diff changeset	96
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	97 def nodebranchdict(repo, ctx):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	98 branches = []
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	99 branch = ctx.branch()
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	100 # If this is an empty repo, ctx.node() == nullid,
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	101 # ctx.branch() == 'default', but branchtags() is
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	102 # an empty dict. Using dict.get avoids a traceback.
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	103 if repo.branchtags().get(branch) == ctx.node():
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	104 branches.append({"name": branch})
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	105 return branches
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	106
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	107 def nodeinbranch(repo, ctx):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	108 branches = []
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	109 branch = ctx.branch()
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	110 if branch != 'default' and repo.branchtags().get(branch) != ctx.node():
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	111 branches.append({"name": branch})
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	112 return branches
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	113
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	114 def nodebranchnodefault(ctx):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	115 branches = []
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	116 branch = ctx.branch()
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	117 if branch != 'default':
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	118 branches.append({"name": branch})
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	119 return branches
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	120
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	121 def showtag(repo, tmpl, t1, node=nullid, **args):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	122 for t in repo.nodetags(node):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	123 yield tmpl(t1, tag=t, **args)
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	124
13596 270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 12691 diff changeset	125 def showbookmark(repo, tmpl, t1, node=nullid, **args):
270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 12691 diff changeset	126 for t in repo.nodebookmarks(node):
270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 12691 diff changeset	127 yield tmpl(t1, bookmark=t, **args)
270f57d35525 hgweb: add display of bookmarks for changelog and changeset Alexander Solovyov <alexander@solovyov.net> parents: 12691 diff changeset	128
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	129 def cleanpath(repo, path):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	130 path = path.lstrip('/')
13971 bfeaa88b875d move canonpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13596 diff changeset	131 return scmutil.canonpath(repo.root, '', path)
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	132
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	133 def changectx(repo, req):
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	134 changeid = "tip"
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	135 if 'node' in req.form:
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	136 changeid = req.form['node'][0]
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	137 elif 'manifest' in req.form:
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	138 changeid = req.form['manifest'][0]
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	139
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	140 try:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6437 diff changeset	141 ctx = repo[changeid]
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	142 except error.RepoError:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	143 man = repo.manifest
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7345 diff changeset	144 ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))]
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	145
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	146 return ctx
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	147
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	148 def filectx(repo, req):
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	149 path = cleanpath(repo, req.form['file'][0])
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	150 if 'node' in req.form:
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	151 changeid = req.form['node'][0]
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	152 else:
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	153 changeid = req.form['filenode'][0]
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	154 try:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6437 diff changeset	155 fctx = repo[changeid][path]
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	156 except error.RepoError:
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	157 fctx = repo.filectx(path, fileid=changeid)
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	158
2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	159 return fctx
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	160
7311 de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	161 def listfilediffs(tmpl, files, node, max):
de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	162 for f in files[:max]:
de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	163 yield tmpl('filedifflink', node=hex(node), file=f)
de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	164 if len(files) > max:
de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	165 yield tmpl('fileellipses')
de9c87fe1620 hgweb: move another utility function into the webutil module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7310 diff changeset	166
9402 5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8225 diff changeset	167 def diffs(repo, tmpl, ctx, files, parity, style):
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	168
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	169 def countgen():
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	170 start = 1
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	171 while True:
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	172 yield start
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	173 start += 1
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	174
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	175 blockcount = countgen()
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	176 def prettyprintlines(diff):
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	177 blockno = blockcount.next()
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	178 for lineno, l in enumerate(diff.splitlines(True)):
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	179 lineno = "%d.%d" % (blockno, lineno + 1)
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	180 if l.startswith('+'):
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	181 ltype = "difflineplus"
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	182 elif l.startswith('-'):
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	183 ltype = "difflineminus"
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	184 elif l.startswith('@'):
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	185 ltype = "difflineat"
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	186 else:
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	187 ltype = "diffline"
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	188 yield tmpl(ltype,
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	189 line=l,
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	190 lineid="l%s" % lineno,
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	191 linenumber="% 8s" % lineno)
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	192
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	193 if files:
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	194 m = match.exact(repo.root, repo.getcwd(), files)
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	195 else:
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	196 m = match.always(repo.root, repo.getcwd())
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	197
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	198 diffopts = patch.diffopts(repo.ui, untrusted=True)
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	199 parents = ctx.parents()
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	200 node1 = parents and parents[0].node() or nullid
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	201 node2 = ctx.node()
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	202
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	203 block = []
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	204 for chunk in patch.diff(repo, node1, node2, m, opts=diffopts):
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	205 if chunk.startswith('diff') and block:
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	206 yield tmpl('diffblock', parity=parity.next(),
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	207 lines=prettyprintlines(''.join(block)))
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	208 block = []
9402 5d49fdef6fd0 hgweb: show diff header line in raw diffs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8225 diff changeset	209 if chunk.startswith('diff') and style != 'raw':
7310 bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	210 chunk = ''.join(chunk.splitlines(True)[1:])
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	211 block.append(chunk)
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	212 yield tmpl('diffblock', parity=parity.next(),
bd522d09d5e3 hgweb: move the diffs() generator into webutil Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7294 diff changeset	213 lines=prettyprintlines(''.join(block)))
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	214
14570 9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	215 def diffstatgen(ctx):
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	216 '''Generator function that provides the diffstat data.'''
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	217
1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	218 stats = patch.diffstatdata(util.iterlines(ctx.diff()))
1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	219 maxname, maxtotal, addtotal, removetotal, binary = patch.diffstatsum(stats)
14570 9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	220 while True:
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	221 yield stats, maxname, maxtotal, addtotal, removetotal, binary
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	222
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	223 def diffsummary(statgen):
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	224 '''Return a short summary of the diff.'''
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	225
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	226 stats, maxname, maxtotal, addtotal, removetotal, binary = statgen.next()
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	227 return _(' %d files changed, %d insertions(+), %d deletions(-)\n') % (
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	228 len(stats), addtotal, removetotal)
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	229
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	230 def diffstat(tmpl, ctx, statgen, parity):
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	231 '''Return a diffstat template for each file in the diff.'''
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	232
9f908ef5a595 web: provide diff summary to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14562 diff changeset	233 stats, maxname, maxtotal, addtotal, removetotal, binary = statgen.next()
14561 925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	234 files = ctx.files()
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	235
14561 925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	236 def pct(i):
925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	237 if maxtotal == 0:
925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	238 return 0
925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	239 return (float(i) / maxtotal) * 100
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	240
14562 fccd3b966da7 web: provide the file number to the diffstat templates Steven Brown <StevenGBrown@gmail.com> parents: 14561 diff changeset	241 fileno = 0
14561 925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	242 for filename, adds, removes, isbinary in stats:
925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	243 template = filename in files and 'diffstatlink' or 'diffstatnolink'
925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	244 total = adds + removes
14562 fccd3b966da7 web: provide the file number to the diffstat templates Steven Brown <StevenGBrown@gmail.com> parents: 14561 diff changeset	245 fileno += 1
fccd3b966da7 web: provide the file number to the diffstat templates Steven Brown <StevenGBrown@gmail.com> parents: 14561 diff changeset	246 yield tmpl(template, node=ctx.hex(), file=filename, fileno=fileno,
14561 925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	247 total=total, addpct=pct(adds), removepct=pct(removes),
925d9f2b188b web: include all files in the diffstat Steven Brown <StevenGBrown@gmail.com> parents: 14490 diff changeset	248 parity=parity.next())
14490 1d3e2349304a web: provide diffstat to the changeset page Steven Brown <StevenGBrown@gmail.com> parents: 14055 diff changeset	249
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	250 class sessionvars(object):
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	251 def __init__(self, vars, start='?'):
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	252 self.start = start
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	253 self.vars = vars
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	254 def __getitem__(self, key):
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	255 return self.vars[key]
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	256 def __setitem__(self, key, value):
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	257 self.vars[key] = value
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	258 def __copy__(self):
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	259 return sessionvars(copy.copy(self.vars), self.start)
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	260 def __iter__(self):
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	261 separator = self.start
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	262 for key, value in self.vars.iteritems():
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	263 yield {'name': key, 'value': str(value), 'separator': separator}
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7311 diff changeset	264 separator = '&'
12691 1b1a9038a71a hgweb: fix hgweb_mod as well as hgwebdir_mod Augie Fackler <durin42@gmail.com> parents: 10282 diff changeset	265
1b1a9038a71a hgweb: fix hgweb_mod as well as hgwebdir_mod Augie Fackler <durin42@gmail.com> parents: 10282 diff changeset	266 class wsgiui(ui.ui):
1b1a9038a71a hgweb: fix hgweb_mod as well as hgwebdir_mod Augie Fackler <durin42@gmail.com> parents: 10282 diff changeset	267 # default termwidth breaks under mod_wsgi
1b1a9038a71a hgweb: fix hgweb_mod as well as hgwebdir_mod Augie Fackler <durin42@gmail.com> parents: 10282 diff changeset	268 def termwidth(self):
1b1a9038a71a hgweb: fix hgweb_mod as well as hgwebdir_mod Augie Fackler <durin42@gmail.com> parents: 10282 diff changeset	269 return 80

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb/webutil.py @ 14570:9f908ef5a595