mercurial-crew-with-dirclash: comparison mercurial/hgweb.py

equal deleted inserted replaced

-:210eeb6f5197
+:fb84d3e71042
 return ''.join(l)
 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 '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'
+print self.tmpl.do_page('htmlstart.tmpl', title = title)
-print '<HTML>'
-print '<!-- created by hgweb 0.1 - jake@edge2.net -->'
-print '<HEAD><TITLE>%s</TITLE>' % title
-print '<style type="text/css">'
-print 'body { font-family: sans-serif; font-size: 12px; }'
-print 'table { font-size: 12px; }'
-print '.errmsg { font-size: 200%; color: red; }'
-print '.filename { font-size: 150%; color: purple; }'
-print '.manifest { font-size: 150%; color: purple; }'
-print '.filehist { font-size: 150%; color: purple; }'
-print '.plusline { color: green; }'
-print '.minusline { color: red; }'
-print '.atline { color: purple; }'
-print '</style>'
-print '</HEAD>'
-print '<BODY>'
 def endpage(self):
 print '</BODY>'
 print '</HTML>'
 class errpage(page):
 def __init__(self):
 page.__init__(self, title="Mercurial Web Error Page")
 class change_list(page):
+def __init__(self, repo, tmpl_dir, reponame, numchanges = 50):
-numchanges = 50   # number of changes to show
+page.__init__(self, tmpl_dir)
+self.repo = repo
-def __init__(self, repo, reponame):
+self.numchanges = numchanges
-page.__init__(self)
+print self.tmpl.do_page('changestitle.tmpl', reponame=reponame)
-self.repo = repo
-print '<h3>Changes For: %s</h3>' % reponame
 def content(self, hi=None):
 cl = []
 count = self.repo.changelog.count()
 if not hi:
 def change_table(self, nodeid, changes):
 hn = hg.hex(nodeid)
 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 '<table summary="" width="100%" border="1">'
+files = []
-print '\t<tr><td valign="top" width="10%">author:</td>' + \
-'<td valign="top" width="20%%">%s</td>' % \
-(obfuscate(changes[1]), )
-print '\t\t<td valign="top" width="10%">description:</td>' + \
-'<td width="60%">' + \
-'<a href="?cmd=chkin;nd=%s">%s</a></td></tr>' % \
-(hn, nl2br(cgi.escape(changes[4])), )
-print '\t<tr><td>date:</td><td>%s UTC</td>' % (datestr, )
-print '\t\t<td valign="top">files:</td><td valign="top">'
 for f in changes[3]:
-print '\t\t<a href="?cmd=file;cs=%s;fn=%s">%s</a>&nbsp;&nbsp;' % \
+files.append('<a href="?cmd=file;cs=%s;fn=%s">%s</a>&nbsp;&nbsp;' \
-(hn, f, cgi.escape(f), )
+% (hn, f, cgi.escape(f)))
-print '\t</td></tr>'
+print self.tmpl.do_page('change_table.tmpl',
-print '\t<tr><td>revision:</td><td colspan="3">%d:<a ' % (i, ) + \
+author=obfuscate(changes[1]),
-'href="?cmd=chkin;nd=%s">%s</a></td></tr>' % (hn, hn, )
+desc=nl2br(cgi.escape(changes[4])), date=datestr,
-print '</table><br />'
+files=''.join(files), revnum=i, revnode=hn)
 class checkin(page):
-def __init__(self, repo, nodestr):
+def __init__(self, repo, tmpl_dir, nodestr):
-page.__init__(self)
+page.__init__(self, tmpl_dir)
 self.repo = repo
 self.node = hg.bin(nodestr)
 self.nodestr = nodestr
 print '<h3>Checkin: %s</h3>' % nodestr
 parents = self.repo.changelog.parents(self.node)
 (h1, h2) = [ hg.hex(x) for x in parents ]
 (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 '<table summary="" width="100%" border="1">'
+files = []
-print '\t<tr><td>revision:</td><td colspan="3">%d:' % (i, ),
+for f in changes[3]:
-print '<a href="?cmd=chkin;nd=%s">%s</a></td></tr>' % \
+files.append('<a href="?cmd=file;nd=%s;fn=%s">%s</a>&nbsp;&nbsp;' \
-(self.nodestr, self.nodestr, )
+% (hg.hex(mf[f]), f, cgi.escape(f)))
-print '\t<tr><td>parent(s):</td><td colspan="3">%d:' % (i1, )
+p2link = h2
-print '<a href="?cmd=chkin;nd=%s">%s</a>' % (h1, h1, ),
 if i2 != -1:
-print '&nbsp;&nbsp;%d:<a href="?cmd=chkin;nd=%s">%s</a>' % \
+p2link = '<a href="?cmd=chkin;nd=%s">%s</a>' % (h2, h2)
-(i2, h2, h2, ),
-else:
+print self.tmpl.do_page('checkin.tmpl', revnum=i, revnode=self.nodestr,
-print '&nbsp;&nbsp;%d:%s' % (i2, h2, ),
+p1num=i1, p1node=h1, p2num=i2, p2node=h2, p2link=p2link,
-print '</td></tr>'
+mfnum=self.repo.manifest.rev(changes[0]),
-print '\t<tr><td>manifest:</td><td colspan="3">%d:' % \
+mfnode=hg.hex(changes[0]), author=obfuscate(changes[1]),
-(self.repo.manifest.rev(changes[0]), ),
+desc=nl2br(cgi.escape(changes[4])), date=datestr)
-print '<a href="?cmd=mf;nd=%s">%s</a></td></tr>' % \
-(hg.hex(changes[0]), hg.hex(changes[0]), )
-print '\t<tr><td valign="top" width="10%">author:</td>' + \
-'<td valign="top" width="20%%">%s</td>' % \
-(obfuscate(changes[1]), )
-print '\t\t<td valign="top" width="10%">description:</td>' + \
-'<td width="60%">' + \
-'<a href="?cmd=chkin;nd=%s">%s</a></td></tr>' % \
-(self.nodestr, nl2br(cgi.escape(changes[4])), )
-print '\t<tr><td>date:</td><td>%s UTC</td>' % (datestr, )
-print '\t\t<td valign="top">files:</td><td valign="top">'
-for f in changes[3]:
-print '\t\t<a href="?cmd=file;nd=%s&fn=%s">%s</a>' % \
-(hg.hex(mf[f]), f, cgi.escape(f), ),
-print '&nbsp;&nbsp;'
-print '\t</td></tr>'
-print '</table><br />'
 (c, a, d) = self.repo.diffrevs(parents[0], self.node)
 change = self.repo.changelog.read(parents[0])
 mf2 = self.repo.manifest.read(change[0])
 for f in c:
 self.show_diff('', self.repo.file(f).read(mf[f]), f)
 for f in d:
 self.show_diff(self.repo.file(f).read(mf2[f]), '', f)
 class filepage(page):
-def __init__(self, repo, fn, node=None, cs=None):
+def __init__(self, repo, tmpl_dir, fn, node=None, cs=None):
-page.__init__(self)
+page.__init__(self, tmpl_dir)
 self.repo = repo
 self.fn = fn
 if cs:
 chng = self.repo.changelog.read(hg.bin(cs))
 mf = self.repo.manifest.read(chng[0])
 print '<pre>'
 print cgi.escape(self.repo.file(self.fn).read(self.node))
 print '</pre>'
 class mfpage(page):
-def __init__(self, repo, node):
+def __init__(self, repo, tmpl_dir, node):
-page.__init__(self)
+page.__init__(self, tmpl_dir)
 self.repo = repo
 self.nodestr = node
 self.node = hg.bin(node)
 def content(self):
 mf = self.repo.manifest.read(self.node)
 fns = mf.keys()
 fns.sort()
-print '<div class="manifest">Manifest (%s)</div>' % self.nodestr
+print self.tmpl.do_page('mftitle.tmpl', node = self.nodestr)
 for f in fns:
-print '<a href="?cmd=file;fn=%s;nd=%s">%s</a><br />' % \
+print self.tmpl.do_page('mfentry.tmpl', fn=f, node=hg.hex(mf[f]))
-(f, hg.hex(mf[f]), f)
 class histpage(page):
-def __init__(self, repo, fn):
+def __init__(self, repo, tmpl_dir, fn):
-page.__init__(self)
+page.__init__(self, tmpl_dir)
 self.repo = repo
 self.fn = fn
 def content(self):
 print '<div class="filehist">File History: %s</div>' % self.fn
 r = self.repo.file(self.fn)
 print '<br />'
 print '<table summary="" width="100%" align="center">'
 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 '<tr><td>'
-self.hist_ent(i, h, i1, h1, i2, h2, ci, cs, changes)
+self.hist_ent(i, r)
 print '</tr></td>'
 print '</table>'
-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 '<table summary="" width="100%" border="1">'
+p2entry = ''
-print '\t<tr><td valign="top" width="10%">author:</td>' + \
+if i2 != -1:
-'<td valign="top" width="20%%">%s</td>' % \
+p2entry = '&nbsp;&nbsp;%d:<a href="?cmd=file;nd=%s;fn=%s">%s</a>' \
-(obfuscate(changes[1]), )
+% (i2, h2, self.fn, h2 ),
-print '\t\t<td valign="top" width="10%">description:</td>' + \
+print self.tmpl.do_page('hist_ent.tmpl', author=obfuscate(changes[1]),
-'<td width="60%">' + \
+csnode=cs, desc=nl2br(cgi.escape(changes[4])),
-'<a href="?cmd=chkin;nd=%s">%s</a></td></tr>' % \
+date = datestr, fn=self.fn, revnode=h, p1num = i1,
-(cs, nl2br(cgi.escape(changes[4])), )
+p1node=h1, p2entry=p2entry)
-print '\t<tr><td>date:</td><td>%s UTC</td>' % (datestr, )
-print '\t\t<td>revision:</td><td>%d:<a ' % (revi, ) + \
-'href="?cmd=file;cs=%s;fn=%s">%s</a></td></tr>' % \
-(cs, self.fn, revs )
-print '\t<tr><td>parent(s):</td><td colspan="3">%d:' % (p1i, )
-print '<a href="?cmd=file;nd=%s;fn=%s">%s</a>' % (p1s, self.fn, p1s, ),
-if p2i != -1:
-print '&nbsp;&nbsp;%d:<a href="?cmd=file;nd=%s;fn=%s">%s</a>' % \
-(p2i, p2s, self.fn, p2s ),
-print '</td></tr>'
-print '</table><br />'
 class hgweb:
 repo_path = "."
 numchanges = 50
+tmpl_dir = "templates"
 def __init__(self):
 pass
 def run(self):
 ui = hg.ui()
 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()
 elif args['cmd'][0] == 'chkin':
 if not args.has_key('nd'):
 page = errpage()
 print '<div class="errmsg">No Node!</div>'
 else:
-page = checkin(repo, args['nd'][0])
+page = checkin(repo, self.tmpl_dir, args['nd'][0])
 page.content()
 page.endpage()
 elif args['cmd'][0] == 'file':
 if not (args.has_key('nd') and args.has_key('fn')) and \
 not (args.has_key('cs') and args.has_key('fn')):
 page = errpage()
 print '<div class="errmsg">Invalid Args!</div>'
 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()
 elif args['cmd'][0] == 'mf':
 if not args.has_key('nd'):
 page = errpage()
 print '<div class="errmsg">No Node!</div>'
 else:
-page = mfpage(repo, args['nd'][0])
+page = mfpage(repo, self.tmpl_dir, args['nd'][0])
 page.content()
 page.endpage()
 elif args['cmd'][0] == 'hist':
 if not args.has_key('fn'):
 page = errpage()
 print '<div class="errmsg">No Filename!</div>'
 else:
-page = histpage(repo, args['fn'][0])
+page = histpage(repo, self.tmpl_dir, args['fn'][0])
 page.content()
 page.endpage()
 elif args['cmd'][0] == 'branches':
 httphdr("text/plain")

changeset 133	fb84d3e71042
parent 132	210eeb6f5197
child 134	13d609f8d830