%s

diff --git a/hgweb.py b/hgweb.py deleted file mode 100644 --- a/hgweb.py +++ /dev/null @@ -1,377 +0,0 @@ -#!/usr/bin/env python -# -# hgweb.py - 0.1 - 9 May 2005 - (c) 2005 Jake Edge -# - web interface to a mercurial repository -# -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. - -# useful for debugging -import cgitb -cgitb.enable() - -import os, cgi, time, re, difflib, sys, zlib -from mercurial import hg, mdiff - -repo_path = "." # change as needed - -def nl2br(text): - return re.sub('\n', '
', text) - -def obfuscate(text): - l = [] - for c in text: - l.append('&#%d;' % ord(c)) - return ''.join(l) - -def httphdr(type): - print 'Content-type: %s\n' % type - -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 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 '

' - -class errpage(page): - def __init__(self): - 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) - self.repo = repo - print '

Changes For: %s

' % reponame - - 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() - - 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 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 - - 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 - - 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 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') 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: - page = checkin(repo, 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 '

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!

' - 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: - page = histpage(repo, args['fn'][0]) - page.content() - page.endpage() - -elif args['cmd'][0] == 'branches': - httphdr("text/plain") - nodes = [] - if args.has_key('nodes'): - nodes = map(hg.bin, args['nodes'][0].split(" ")) - for b in repo.branches(nodes): - print " ".join(map(hg.hex, b)) - -elif args['cmd'][0] == 'between': - httphdr("text/plain") - nodes = [] - if args.has_key('pairs'): - pairs = [ map(hg.bin, p.split("-")) - for p in args['pairs'][0].split(" ") ] - for b in repo.between(pairs): - print " ".join(map(hg.hex, b)) - -elif args['cmd'][0] == 'changegroup': - httphdr("application/hg-changegroup") - nodes = [] - if args.has_key('roots'): - nodes = map(hg.bin, args['roots'][0].split(" ")) - - z = zlib.compressobj() - for chunk in repo.changegroup(nodes): - sys.stdout.write(z.compress(chunk)) - - sys.stdout.write(z.flush()) - -else: - page = errpage() - print '

unknown command: %s

' % \ - cgi.escape(args['cmd'][0]) - page.endpage() diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py new file mode 100644 --- /dev/null +++ b/mercurial/hgweb.py @@ -0,0 +1,377 @@ +#!/usr/bin/env python +# +# hgweb.py - 0.1 - 9 May 2005 - (c) 2005 Jake Edge +# - web interface to a mercurial repository +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +# useful for debugging +import cgitb +cgitb.enable() + +import os, cgi, time, re, difflib, sys, zlib +from mercurial import hg, mdiff + +repo_path = "." # change as needed + +def nl2br(text): + return re.sub('\n', '
', text) + +def obfuscate(text): + l = [] + for c in text: + l.append('&#%d;' % ord(c)) + return ''.join(l) + +def httphdr(type): + print 'Content-type: %s\n' % type + +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 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 '

' + +class errpage(page): + def __init__(self): + 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) + self.repo = repo + print '

Changes For: %s

' % reponame + + 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() + + 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 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 + + 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 + + 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 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') 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: + page = checkin(repo, 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 '

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!

' + 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: + page = histpage(repo, args['fn'][0]) + page.content() + page.endpage() + +elif args['cmd'][0] == 'branches': + httphdr("text/plain") + nodes = [] + if args.has_key('nodes'): + nodes = map(hg.bin, args['nodes'][0].split(" ")) + for b in repo.branches(nodes): + print " ".join(map(hg.hex, b)) + +elif args['cmd'][0] == 'between': + httphdr("text/plain") + nodes = [] + if args.has_key('pairs'): + pairs = [ map(hg.bin, p.split("-")) + for p in args['pairs'][0].split(" ") ] + for b in repo.between(pairs): + print " ".join(map(hg.hex, b)) + +elif args['cmd'][0] == 'changegroup': + httphdr("application/hg-changegroup") + nodes = [] + if args.has_key('roots'): + nodes = map(hg.bin, args['roots'][0].split(" ")) + + z = zlib.compressobj() + for chunk in repo.changegroup(nodes): + sys.stdout.write(z.compress(chunk)) + + sys.stdout.write(z.flush()) + +else: + page = errpage() + print '

unknown command: %s

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