%s

# HG changeset patch # User jake@edge2.net # Date 1116717222 25200 # Node ID fb84d3e7104243881f638a2e33be8cf5908e4b19 # Parent 210eeb6f5197ce36bd89c94425f611b3683a395c added template support for some hgweb output, also, template files for the parts that have been converted diff -r 210eeb6f5197 -r fb84d3e71042 mercurial/hgweb.py --- a/mercurial/hgweb.py Sat May 21 11:46:16 2005 -0700 +++ b/mercurial/hgweb.py Sat May 21 16:13:42 2005 -0700 @@ -25,27 +25,34 @@ def httphdr(type): print 'Content-type: %s\n' % type +class template: + def __init__(self, tmpl_dir): + self.tmpl_dir = tmpl_dir + def do_page(self, tmpl_fn, **map): + out = [] + txt = file(os.path.join(self.tmpl_dir, tmpl_fn)).read() + while txt: + m = re.search(r"#([a-zA-Z0-9]+)#", txt) + if m: + out.append(txt[:m.start(0)]) + v = map.get(m.group(1), "") + if callable(v): + for y in v(**map): out.append(y) + else: + out.append(str(v)) + txt = txt[m.end(0):] + else: + out.append(txt) + txt = '' + return ''.join(out) + class page: - def __init__(self, type="text/html", title="Mercurial Web", + def __init__(self, tmpl_dir = "", type="text/html", title="Mercurial Web", charset="ISO-8859-1"): + self.tmpl = template(tmpl_dir) + print 'Content-type: %s; charset=%s\n' % (type, charset) - print '' - print '' - print '' - print '%s' % title - print '' - print '' - print '' + print self.tmpl.do_page('htmlstart.tmpl', title = title) def endpage(self): print '' @@ -73,13 +80,11 @@ page.__init__(self, title="Mercurial Web Error Page") class change_list(page): - - numchanges = 50 # number of changes to show - - def __init__(self, repo, reponame): - page.__init__(self) + def __init__(self, repo, tmpl_dir, reponame, numchanges = 50): + page.__init__(self, tmpl_dir) self.repo = repo - print '

Changes For: %s

' % reponame + self.numchanges = numchanges + print self.tmpl.do_page('changestitle.tmpl', reponame=reponame) def content(self, hi=None): cl = [] @@ -126,27 +131,18 @@ i = self.repo.changelog.rev(nodeid) (h1, h2) = [ hg.hex(x) for x in self.repo.changelog.parents(nodeid) ] datestr = time.asctime(time.gmtime(float(changes[2].split(' ')[0]))) - print '' - print '\t' + \ - '' % \ - (obfuscate(changes[1]), ) - print '\t\t' + \ - '' % \ - (hn, nl2br(cgi.escape(changes[4])), ) - print '\t' % (datestr, ) - print '\t\t' - print '\t' % (hn, hn, ) - print '

author:	%s	description:	' + \ - '%s
date:	%s UTC	files:	' + files = [] for f in changes[3]: - print '\t\t%s ' % \ - (hn, f, cgi.escape(f), ) - print '\t
revision:	%d:%s

' + files.append('%s ' \ + % (hn, f, cgi.escape(f))) + print self.tmpl.do_page('change_table.tmpl', + author=obfuscate(changes[1]), + desc=nl2br(cgi.escape(changes[4])), date=datestr, + files=''.join(files), revnum=i, revnode=hn) class checkin(page): - def __init__(self, repo, nodestr): - page.__init__(self) + def __init__(self, repo, tmpl_dir, nodestr): + page.__init__(self, tmpl_dir) self.repo = repo self.node = hg.bin(nodestr) self.nodestr = nodestr @@ -160,37 +156,19 @@ (i1, i2) = [ self.repo.changelog.rev(x) for x in parents ] datestr = time.asctime(time.gmtime(float(changes[2].split(' ')[0]))) mf = self.repo.manifest.read(changes[0]) - print '' - print '\t' % \ - (self.nodestr, self.nodestr, ) - print '\t' - print '\t' % \ - (hg.hex(changes[0]), hg.hex(changes[0]), ) - print '\t' + \ - '' % \ - (obfuscate(changes[1]), ) - print '\t\t' + \ - '' % \ - (self.nodestr, nl2br(cgi.escape(changes[4])), ) - print '\t' % (datestr, ) - print '\t\t' - print '

revision:	%d:' % (i, ), - print '%s
parent(s):	%d:' % (i1, ) - print '%s' % (h1, h1, ), + files = [] + for f in changes[3]: + files.append('%s ' \ + % (hg.hex(mf[f]), f, cgi.escape(f))) + p2link = h2 if i2 != -1: - print ' %d:%s' % \ - (i2, h2, h2, ), - else: - print ' %d:%s' % (i2, h2, ), - print '
manifest:	%d:' % \ - (self.repo.manifest.rev(changes[0]), ), - print '%s
author:	%s	description:	' + \ - '%s
date:	%s UTC	files:	' - for f in changes[3]: - print '\t\t%s' % \ - (hg.hex(mf[f]), f, cgi.escape(f), ), - print ' ' - print '\t

' + p2link = '%s' % (h2, h2) + + print self.tmpl.do_page('checkin.tmpl', revnum=i, revnode=self.nodestr, + p1num=i1, p1node=h1, p2num=i2, p2node=h2, p2link=p2link, + mfnum=self.repo.manifest.rev(changes[0]), + mfnode=hg.hex(changes[0]), author=obfuscate(changes[1]), + desc=nl2br(cgi.escape(changes[4])), date=datestr) (c, a, d) = self.repo.diffrevs(parents[0], self.node) change = self.repo.changelog.read(parents[0]) @@ -204,8 +182,8 @@ self.show_diff(self.repo.file(f).read(mf2[f]), '', f) class filepage(page): - def __init__(self, repo, fn, node=None, cs=None): - page.__init__(self) + def __init__(self, repo, tmpl_dir, fn, node=None, cs=None): + page.__init__(self, tmpl_dir) self.repo = repo self.fn = fn if cs: @@ -226,8 +204,8 @@ print '' class mfpage(page): - def __init__(self, repo, node): - page.__init__(self) + def __init__(self, repo, tmpl_dir, node): + page.__init__(self, tmpl_dir) self.repo = repo self.nodestr = node self.node = hg.bin(node) @@ -236,14 +214,13 @@ mf = self.repo.manifest.read(self.node) fns = mf.keys() fns.sort() - print '

Manifest (%s)

' % self.nodestr + print self.tmpl.do_page('mftitle.tmpl', node = self.nodestr) for f in fns: - print '%s
' % \ - (f, hg.hex(mf[f]), f) + print self.tmpl.do_page('mfentry.tmpl', fn=f, node=hg.hex(mf[f])) class histpage(page): - def __init__(self, repo, fn): - page.__init__(self) + def __init__(self, repo, tmpl_dir, fn): + page.__init__(self, tmpl_dir) self.repo = repo self.fn = fn @@ -253,44 +230,34 @@ print '
' print '' for i in xrange(r.count()-1, -1, -1): - n = r.node(i) - (p1, p2) = r.parents(n) - (h, h1, h2) = map(hg.hex, (n, p1, p2)) - (i1, i2) = map(r.rev, (p1, p2)) - ci = r.linkrev(n) - cn = self.repo.changelog.node(ci) - cs = hg.hex(cn) - changes = self.repo.changelog.read(cn) print '' print '

' - self.hist_ent(i, h, i1, h1, i2, h2, ci, cs, changes) + self.hist_ent(i, r) print '

' - def hist_ent(self, revi, revs, p1i, p1s, p2i, p2s, ci, cs, changes): + def hist_ent(self, i, r): + n = r.node(i) + (p1, p2) = r.parents(n) + (h, h1, h2) = map(hg.hex, (n, p1, p2)) + (i1, i2) = map(r.rev, (p1, p2)) + ci = r.linkrev(n) + cn = self.repo.changelog.node(ci) + cs = hg.hex(cn) + changes = self.repo.changelog.read(cn) datestr = time.asctime(time.gmtime(float(changes[2].split(' ')[0]))) - print '' - print '\t' + \ - '' % \ - (obfuscate(changes[1]), ) - print '\t\t' + \ - '' % \ - (cs, nl2br(cgi.escape(changes[4])), ) - print '\t' % (datestr, ) - print '\t\t' % \ - (cs, self.fn, revs ) - print '\t' - print '

author:	%s	description:	' + \ - '%s
date:	%s UTC	revision:	%d:%s
parent(s):	%d:' % (p1i, ) - print '%s' % (p1s, self.fn, p1s, ), - if p2i != -1: - print ' %d:%s' % \ - (p2i, p2s, self.fn, p2s ), - print '

' - + p2entry = '' + if i2 != -1: + p2entry = ' %d:%s' \ + % (i2, h2, self.fn, h2 ), + print self.tmpl.do_page('hist_ent.tmpl', author=obfuscate(changes[1]), + csnode=cs, desc=nl2br(cgi.escape(changes[4])), + date = datestr, fn=self.fn, revnode=h, p1num = i1, + p1node=h1, p2entry=p2entry) + class hgweb: repo_path = "." numchanges = 50 + tmpl_dir = "templates" def __init__(self): pass @@ -303,7 +270,8 @@ repo = hg.repository(ui, self.repo_path) if not args.has_key('cmd') or args['cmd'][0] == 'changes': - page = change_list(repo, 'Mercurial') + page = change_list(repo, self.tmpl_dir, 'Mercurial', + self.numchanges) hi = args.get('hi', ( repo.changelog.count(), )) page.content(hi = int(hi[0])) page.endpage() @@ -313,7 +281,7 @@ page = errpage() print '

No Node!

' else: - page = checkin(repo, args['nd'][0]) + page = checkin(repo, self.tmpl_dir, args['nd'][0]) page.content() page.endpage() @@ -324,9 +292,11 @@ print '

Invalid Args!

' else: if args.has_key('nd'): - page = filepage(repo, args['fn'][0], node=args['nd'][0]) + page = filepage(repo, self.tmpl_dir, + args['fn'][0], node=args['nd'][0]) else: - page = filepage(repo, args['fn'][0], cs=args['cs'][0]) + page = filepage(repo, self.tmpl_dir, + args['fn'][0], cs=args['cs'][0]) page.content() page.endpage() @@ -335,7 +305,7 @@ page = errpage() print '

No Node!

' else: - page = mfpage(repo, args['nd'][0]) + page = mfpage(repo, self.tmpl_dir, args['nd'][0]) page.content() page.endpage() @@ -344,7 +314,7 @@ page = errpage() print '

No Filename!

' else: - page = histpage(repo, args['fn'][0]) + page = histpage(repo, self.tmpl_dir, args['fn'][0]) page.content() page.endpage() diff -r 210eeb6f5197 -r fb84d3e71042 templates/change_table.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/change_table.tmpl Sat May 21 16:13:42 2005 -0700 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + +

author:	#author#	description:	+ #desc# +
date:	#date# UTC	files:	#files#
revision:	+ #revnum#:#revnode# +

+
+ diff -r 210eeb6f5197 -r fb84d3e71042 templates/changestitle.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/changestitle.tmpl Sat May 21 16:13:42 2005 -0700 @@ -0,0 +1,1 @@ +

Changes For: #reponame#

diff -r 210eeb6f5197 -r fb84d3e71042 templates/checkin.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/checkin.tmpl Sat May 21 16:13:42 2005 -0700 @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +

revision:	+ #revnum#: #revnode# +
parent(s):	+ #p1num#: + #p1node# + #p2num#:#p2link# +
manifest:	+ #mfnum#: #mfnode# +
author:	#author#	description:	#desc#
date:	#date# UTC	files:	#files#

+
diff -r 210eeb6f5197 -r fb84d3e71042 templates/hist_ent.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/hist_ent.tmpl Sat May 21 16:13:42 2005 -0700 @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + +

author:	#author#	description:	#desc#
date:	#date# UTC	revision:	#revnode#
parent(s):	+ #p1num#: #p1node# + #p2entry# +

+
diff -r 210eeb6f5197 -r fb84d3e71042 templates/htmlstart.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/htmlstart.tmpl Sat May 21 16:13:42 2005 -0700 @@ -0,0 +1,18 @@ + + + +#title# + + + + diff -r 210eeb6f5197 -r fb84d3e71042 templates/mfentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/mfentry.tmpl Sat May 21 16:13:42 2005 -0700 @@ -0,0 +1,1 @@ +#fn#
diff -r 210eeb6f5197 -r fb84d3e71042 templates/mftitle.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/mftitle.tmpl Sat May 21 16:13:42 2005 -0700 @@ -0,0 +1,1 @@ +

Manifest (#node#)