%s

diff -r 3dde7c87e36d -r 58039eddbdda hgweb.py --- a/hgweb.py Wed May 18 16:59:54 2005 -0800 +++ b/hgweb.py Wed May 18 17:06:07 2005 -0800 @@ -24,173 +24,322 @@ l.append('&#%d;' % ord(c)) return ''.join(l) -def httphdr(type = "text/html"): +def httphdr(type): print 'Content-type: %s\n' % type -def htmldoctype(): - print '' +class page: + def __init__(self, type="text/html", title="Mercurial Web", + charset="ISO-8859-1"): + print 'Content-type: %s; charset=%s\n' % (type, charset) + print '' + print '' + print '' + print '%s' % title + print '' + print '' + print '' + + def endpage(self): + print '' + print '' -def htmlhead(title): - print '' - print '' - print '%s' % (title, ) - print '' + def show_diff(self, a, b, fn): + a = a.splitlines(1) + b = b.splitlines(1) + l = difflib.unified_diff(a, b, fn, fn) + print '

'
+        for line in l:
+            line = cgi.escape(line[:-1])
+            if line.startswith('+'):
+                print '%s' % (line, )
+            elif line.startswith('-'):
+                print '%s' % (line, )
+            elif line.startswith('@'):
+                print '%s' % (line, )
+            else:
+                print line
+        print '

' -def startpage(title): - httphdr() - htmldoctype() - htmlhead(title) - print '' +class errpage(page): + def __init__(self): + page.__init__(self, title="Mercurial Web Error Page") + +class change_list(page): -def endpage(): - print '' - print '' + numchanges = 50 # number of changes to show - + def __init__(self, repo, reponame): + page.__init__(self) + self.repo = repo + print '

Changes For: %s

' % reponame -def ent_change(repo, nodeid): - changes = repo.changelog.read(nodeid) - hn = hg.hex(nodeid) - i = repo.changelog.rev(nodeid) - (h1, h2) = [ hg.hex(x) for x in 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(changes[4]), ) - print '\t' % (datestr, ) - print '\t\t' -# print '\t' % (hn, hn, ) - print '

author:	%s	description:	' + \ - '%s
date:	%s UTC	files:	' - for f in changes[3]: - print '\t\t%s ' % f - print '\t
revision:	%d:%s

' + def content(self, hi=None): + cl = [] + count = self.repo.changelog.count() + if not hi: + hi = count + elif hi < self.numchanges: + hi = self.numchanges + + start = 0 + if hi - self.numchanges >= 0: + start = hi - self.numchanges + + nav = "Displaying Revisions: %d-%d" % (start, hi-1) + if start != 0: + nav = ('Previous %d ' \ + % (start, self.numchanges)) + nav + if hi != count: + if hi + self.numchanges <= count: + nav += ' Next %d' \ + % (hi + self.numchanges, self.numchanges) + else: + nav += ' Next %d' % \ + self.numchanges + + print '%s' % nav + + for i in xrange(start, hi): + n = self.repo.changelog.node(i) + cl.append((n, self.repo.changelog.read(n))) + cl.reverse() -def ent_diff(a, b, fn): - a = a.splitlines(1) - b = b.splitlines(1) - l = difflib.unified_diff(a, b, fn, fn) - print '

'
-    for line in l:
-        line = cgi.escape(line[:-1])
-        if line.startswith('+'):
-            print '%s' % (line, )
-        elif line.startswith('-'):
-            print '%s' % (line, )
-        elif line.startswith('@'):
-            print '%s' % (line, )
-        else:
-            print line
-    print '

' + print '' + for n, ch in cl: + print '' + print '

' + self.change_table(n, ch) + print '

' + + print '%s' % nav + + 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 '' + 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:	' + for f in changes[3]: + print '\t\t%s ' % \ + (hn, f, cgi.escape(f), ) + print '\t
revision:	%d:%s

' + +class checkin(page): + def __init__(self, repo, nodestr): + page.__init__(self) + self.repo = repo + self.node = hg.bin(nodestr) + self.nodestr = nodestr + print '

Checkin: %s

' % nodestr -def ent_checkin(repo, nodeid): - startpage("Mercurial Web") + def content(self): + changes = self.repo.changelog.read(self.node) + i = self.repo.changelog.rev(self.node) + 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 '' + 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, ), + 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

' + + (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(mf2[f]), \ + self.repo.file(f).read(mf[f]), f) + for f in a: + 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): + page.__init__(self) + self.repo = repo + self.fn = fn + if cs: + chng = self.repo.changelog.read(hg.bin(cs)) + mf = self.repo.manifest.read(chng[0]) + self.node = mf[self.fn] + self.nodestr = hg.hex(self.node) + else: + self.nodestr = node + self.node = hg.bin(node) + print '

%s (%s)

' % \ + (cgi.escape(self.fn), self.nodestr, ) + print 'history
' % self.fn - changes = repo.changelog.read(nodeid) - hn = hg.hex(nodeid) - i = repo.changelog.rev(nodeid) - parents = repo.changelog.parents(nodeid) - (h1, h2) = [ hg.hex(x) for x in parents ] - (i1, i2) = [ repo.changelog.rev(x) for x in parents ] - datestr = time.asctime(time.gmtime(float(changes[2].split(' ')[0]))) - mf = repo.manifest.read(changes[0]) - print '' - print '\t' % (hn, hn, ) - print '\t' - print '\t' % \ - (hg.hex(changes[0]), hg.hex(changes[0]), ) - print '\t' + \ - '' % (obfuscate(changes[1]), ) - print '\t\t' + \ - '' % \ - (hn, nl2br(changes[4]), ) - print '\t' % (datestr, ) - print '\t\t' - print '

revision:	%d:' % (i, ), - print '%s
parent(s):	%d:' % (i1, ) - print '%s' % (h1, h1, ), - if i2 != -1: - print ' %d:%s' % \ - (i2, h2, h2, ), - else: - print ' %d:%s' % (i2, h2, ), - print '
manifest:	%d:' % \ - (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, f, ), - print ' ' - print '\t

' + def content(self): + print '

'
+        print cgi.escape(self.repo.file(self.fn).read(self.node))
+        print '

' + +class mfpage(page): + def __init__(self, repo, node): + page.__init__(self) + 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 '

Manifest (%s)

' % self.nodestr + for f in fns: + print '%s
' % \ + (f, hg.hex(mf[f]), f) + +class histpage(page): + def __init__(self, repo, fn): + page.__init__(self) + self.repo = repo + self.fn = fn - (c, a, d) = repo.diffrevs(parents[0], nodeid) - change = repo.changelog.read(parents[0]) - mf2 = repo.manifest.read(change[0]) - for f in c: - ent_diff(repo.file(f).read(mf2[f]), repo.file(f).read(mf[f]), f) - for f in a: - ent_diff('', repo.file(f).read(mf[f]), f) - for f in d: - ent_diff(repo.file(f).read(mf2[f]), '', f) - - endpage() - + def content(self): + print '

File History: %s

' % self.fn + r = self.repo.file(self.fn) + 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) + print '

' -def ent_file(repo, nodeid, fn): - print '

%s (%s)

' % (fn, hg.hex(nodeid), ) - print '

'
-    print cgi.escape(repo.file(fn).read(nodeid))
-    print '

' - -def change_page(): - startpage("Mercurial Web") - print '' - for i in xrange(0, repo.changelog.count()): - n = repo.changelog.node(i) - print '' - - print '

' - ent_change(repo, n) - print '

' - endpage() + def hist_ent(self, revi, revs, p1i, p1s, p2i, p2s, ci, cs, changes): + 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 '

' args = cgi.parse() ui = hg.ui() repo = hg.repository(ui, repo_path) -if not args.has_key('cmd'): - change_page() +if not args.has_key('cmd') or args['cmd'][0] == 'changes': + page = change_list(repo, 'Mercurial') + 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 '

No Node!

' else: - ent_checkin(repo, hg.bin(args['nd'][0])) + page = checkin(repo, args['nd'][0]) + page.content() + page.endpage() elif args['cmd'][0] == 'file': - startpage("Mercurial Web") + 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 '

Invalid Args!

' + else: + if args.has_key('nd'): + page = filepage(repo, args['fn'][0], node=args['nd'][0]) + else: + page = filepage(repo, 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 '

No Node!

' - elif not args.has_key('fn'): + else: + page = mfpage(repo, args['nd'][0]) + page.content() + page.endpage() + +elif args['cmd'][0] == 'hist': + if not args.has_key('fn'): + page = errpage() print '

No Filename!

' else: - ent_file(repo, hg.bin(args['nd'][0]), args['fn'][0]) - endpage() + page = histpage(repo, args['fn'][0]) + page.content() + page.endpage() elif args['cmd'][0] == 'branches': httphdr("text/plain") @@ -222,6 +371,7 @@ sys.stdout.write(z.flush()) else: - startpage("Mercurial Web Error") - print '

unknown command: ', args['cmd'][0], '

' - endpage() + page = errpage() + print '

unknown command: %s

' % \ + cgi.escape(args['cmd'][0]) + page.endpage()