# 
# 
# patch "branch.psp"
#  from [0fd5280a8d954d769ac708db08743ce391fb934c]
#    to [a894fc2db554fbf665e1b5b540a5ed35acac5aba]
# 
# patch "common.py"
#  from [1fdb62e05fb2a9338d2c72ddc58de3ab2b3976fe]
#    to [755634178ad470975e6cb0f960b9ee83f3df7450]
# 
# patch "html.py"
#  from [918ee71ec6f5ccb116ed425671dd1cad616c9079]
#    to [1832f26b3391d38da46c1431af1be33ee7d65059]
# 
# patch "revision.psp"
#  from [ed955d64d22c2dca62a89eb8b6484d19acec5db1]
#    to [d79d6a8b9ab04332baeb0745c6ad7c18f00ab8f6]
# 
============================================================
--- branch.psp	0fd5280a8d954d769ac708db08743ce391fb934c
+++ branch.psp	a894fc2db554fbf665e1b5b540a5ed35acac5aba
@@ -25,15 +25,35 @@
 	try: page = int(form['page'])
 	except: pass
 
+if form.has_key('rss'):
+	output = 'rss'
+else:
+	output = 'html'
+
 if page < 1: page = 1
 
 display = 10
 offset = page * display
 
 branch = form['branch']
-info = {'title' : "Changes to branch %s" % (hq(branch))}
-req.write(template.header(info))
 
+page_title = "Changes to branch %s" % (hq(branch))
+if output == 'html':
+	info = {
+		'title' : page_title, 
+		'extra_header' : link('branch_rss', branch)
+		}
+	req.write(template.header(info))
+elif output == 'rss':
+	req.write('''\
+<rss version="2.0">
+  <channel>
+    <language>en-us</language>
+
+    <title>%s</title>
+    <link>%s</link>
+    <description>%s</description>''' % (page_title, config.base_url, page_title))
+
 heads = mt.heads(branch)
 
 recent = mt.toposort(mt.ancestors(heads) + heads)
@@ -53,16 +73,24 @@
 
 %>
 
+<%
+if output == 'html':
+	req.write('''\
 <p>
-This page lists changes <%= -1*(stop or 0) %> through <%= -1 * start %> to <%=link("branch", branch)%>.
-It may also be useful to view the <%=link("headofbranch", branch, "current head revision")%> of this branch.
-</p>
+This page lists changes %s through %s to %s.
+It may also be useful to view the %s of this branch.
+</p>''' % (-1*(stop or 0), (-1 * start), link('branch', branch), link('headofbranch', 'branch', 'current head revision')))
+	req.write('<table class="pretty" style="position: relative; width: 80%; left: 10%;">')
+%>
 
 <%
-req.write('<table class="pretty" style="position: relative; width: 80%; left: 10%;">')
 for idx, id in enumerate(recent):
 	certs = mt.certs(id)
 
+	if output == 'rss':
+		req.write('<item>\n')
+		req.write('<link>%s</link>\n' % (urllib.basejoin(config.base_url, 'revision.psp?id=%s' % (urllib.quote(id)))))
+
 	changelog, certdate, quicklog, certinfo = None, None, "", ""
 	for cert in certs:
 		name, value = None, None
@@ -72,10 +100,16 @@
 		if name == None or value == None: continue
 		if name == "date":
 			certdate = apply(datetime.datetime, time.strptime(value, "%Y-%m-%dT%H:%M:%S")[:6])
-		if name == "branch":
+			if output == 'rss': req.write("\t<pubDate>%s</pubDate>\n" % hq(certdate.strftime("%a, %d %m %Y %H:%M:%S +0000")))
+		elif name == "branch":
 			value = link("branch", value)
 		else:
-			if name == "changelog": quicklog = hq(value.strip().split('\n')[0])
+			if name == "changelog":
+				quicklog = hq(value.strip().split('\n')[0])
+				if quicklog.startswith('*'): quicklog = quicklog[1:].strip()
+				if output == 'rss': req.write("\t<title>%s</title>\n<description>%s</description>\n" % (quicklog, hq(value)))
+			elif name == "author":
+				if output == 'rss': req.write("\t<author>%s</author>\n" % (hq(value)))
 			value = '<br />'.join(map(hq, value.split('\n')))
 		certinfo += '<tr><th align="right" valign="top">%s:</th><td valign="top">%s</td></tr>\n' % (prettify(name), value)
 
@@ -91,28 +125,36 @@
 		minutes = ago.seconds / 60
 		seconds = (ago.seconds - (minutes * 60))
 		ago = "%d minutes, %d seconds" % (minutes, seconds)
-	style = "font-size: 130%%; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: black;"
-	if idx != 0: 
-		style += "border-top-style: solid; border-top-width: 1px; border-top-color: black;"
-	req.write('<tr><th colspan="2" style="%s">%s ago: %s (%s)</th></tr>\n' % (style, ago, quicklog, link("revision", id, "more info")))
-	req.write(certinfo)
-req.write('</table>')
 
-%>
+	if output == 'html':
+		style = "font-size: 130%%; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: black;"
+		if idx != 0: 
+			style += "border-top-style: solid; border-top-width: 1px; border-top-color: black;"
+		req.write('<tr><th colspan="2" style="%s">%s ago: %s (%s)</th></tr>\n' % (style, ago, quicklog, link("revision", id, "more info")))
+		req.write(certinfo)
+	elif output == 'rss':
+		req.write('</item>\n')
 
-<%
-c = []
-if page != 1:
-	c.append('<a href="branch.psp?branch=%s&page=%d">Newer changes</a>' % (urllib.quote(branch), page-1))
-if not no_next:
-	c.append('<a href="branch.psp?branch=%s&page=%d">Older changes</a>' % (urllib.quote(branch), page+1))
-req.write('<p align="center">' + ' | '.join(c) + '</p>')
+if output == 'html':
+	req.write('</table>')
 
+	c = []
+	if page != 1:
+		c.append('<a href="branch.psp?branch=%s&page=%d">Newer changes</a>' % (urllib.quote(branch), page-1))
+	if not no_next:
+		c.append('<a href="branch.psp?branch=%s&page=%d">Older changes</a>' % (urllib.quote(branch), page+1))
+	req.write('<p align="center">' + ' | '.join(c) + '</p>')
+
 %>
 
 <%
 
-req.write(template.footer(info))
-
+if output == 'html':
+	req.write(template.footer(info))
+elif output == 'rss':
+	req.write('''\
+  </channel>
+</rss>
+''')
 %>
 
============================================================
--- common.py	1fdb62e05fb2a9338d2c72ddc58de3ab2b3976fe
+++ common.py	755634178ad470975e6cb0f960b9ee83f3df7450
@@ -62,6 +62,8 @@
 		return rv
 	elif link_type == "manifest":
 		return '[' + hq(link_to[:8]) + '..]'
+	elif link_type == "branch_rss":
+		return '<link rel="alternate" type="application/rss+xml" href="?branch=%s&rss=1" title="%s">' % (urllib.quote(link_to), hq(description or ("RSS feed for " + link_to)))
 	else:
 		rv = '<span style="color:red;">Unknown link type: %s</span>' % (hq(link_type))
 		return rv
============================================================
--- html.py	918ee71ec6f5ccb116ed425671dd1cad616c9079
+++ html.py	1832f26b3391d38da46c1431af1be33ee7d65059
@@ -5,6 +5,7 @@
 class Template:
 	def header(self, info):
 		if not info.has_key("title"): info['title'] = "untitled"
+		if not info.has_key("extra_header"): info['extra_header'] = ''
 		return """\
 	<?xml version="1.0" encoding="UTF-8"?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -12,6 +13,8 @@
 	<head>
 	<title>ViewMTN: %(title)s</title>
 	<link rel="stylesheet" href="viewmtn.css" type="text/css" media="screen" />
+	<!-- extra headers -->
+	%(extra_header)s
 	</head>
 	<body>
 	<div id="menuBar">
============================================================
--- revision.psp	ed955d64d22c2dca62a89eb8b6484d19acec5db1
+++ revision.psp	d79d6a8b9ab04332baeb0745c6ad7c18f00ab8f6
@@ -22,9 +22,29 @@
 if not monotone.is_valid_id(id):
 	raise Exception("Specified revision ID is not valid.")
 
-info = {'title' : "Revision %s" % (hq(id))}
+# read certificates
+certs = mt.certs(id)
+branches, cert_table = [], ""
+for cert in certs:
+	name, value = None, None
+	for k, v in cert:
+		if k == "name": name = v
+		elif k == "value": value = v
+	if name == None or value == None: continue
+	if name == "branch":
+		branches.append(value)
+		value = link("branch", value)
+	else:
+		value = '<br />'.join(map(hq, value.split('\n')))
+	cert_table += '<tr><th valign="top">%s</th><td valign="top">%s</td></tr>' % (prettify(name), value)
+
+info = {
+	'title' : "Revision %s" % (hq(id)),
+	'extra_header' : '\n'.join(map(lambda x: link('branch_rss', x), branches))
+	}
 req.write(template.header(info))
 
+# generate the revision graph
 ancestry_limit = 10
 ancestry_maximum = 100
 try:
@@ -46,21 +66,7 @@
 <h2>Certificates</h2>
 
 <table class="pretty">
-<%
-certs = mt.certs(id)
-for cert in certs:
-	name, value = None, None
-	for k, v in cert:
-		if k == "name": name = v
-		elif k == "value": value = v
-	if name == None or value == None: continue
-	if name == "branch":
-		value = link("branch", value)
-	else:
-		value = '<br />'.join(map(hq, value.split('\n')))
-	req.write('<tr><th valign="top">%s</th><td valign="top">%s</td></tr>' % (prettify(name), value))
-
-%>
+<%= cert_table %>
 </table>
 
 <h2>Revision details</h2>