# 
# 
# patch "common.py"
#  from [f233ee82566d9d1a2dbe414998f9fef6b46c17b2]
#    to [87a1283680b253e297af32da14119a2546730fda]
# 
# patch "fileinbranch.psp"
#  from [66e47a474cb46610adc8117eaf45f7fa64d9e88b]
#    to [1d3a5d5742dacc82879b558f8e785915653839c0]
# 
# patch "manifest.psp"
#  from [89b19f937c39d159920708dc2cc8c2a80dc2cbec]
#    to [d6cec402657f3518eb8017a54a22428644dcc233]
# 
# patch "revision.psp"
#  from [9cb020164c77e5a2a33a798d418690d072bc1c3c]
#    to [54379dc8fb3e0fd02a084fcd92bdb0f41a85de61]
# 
# patch "viewmtn.css"
#  from [8f34d3d1b7b375830bfbf12ae362a575b2a79385]
#    to [a1b37d9cb0fa5fddaf650dccc25af95bd9597a3f]
# 
============================================================
--- common.py	f233ee82566d9d1a2dbe414998f9fef6b46c17b2
+++ common.py	87a1283680b253e297af32da14119a2546730fda
@@ -39,7 +39,7 @@
 		else: rv += "diff"
 		rv += '</a>'
 		return rv
-	elif link_type == "file":
+	elif link_type == "download":
 		if type(link_to) == type([]):
 			rv = '<a href="getfile.py?id=%s&amp;path=%s">' % (urllib.quote(link_to[0]), urllib.quote(link_to[1]))
 			link_id = link_to[0]
@@ -49,6 +49,12 @@
 		if description != None: rv += description + "</a>"
 		else: rv = "[" + rv + hq(link_id[:8]) + ".." + "</a>]"
 		return rv
+	elif link_type == "file":
+		revision_id, path = link_to
+		rv = '<a href="file.psp?id=%s&amp;path=%s">' % (urllib.quote(revision_id), urllib.quote(path))
+		if description != None: rv += description + "</a>"
+		else: rv = "[" + rv + hq(path + '@' + revision_id[:8]) + ".." + "</a>]"
+		return rv
 	elif link_type == "branch":
 		rv = '<a href="branch.psp?branch=%s">' % (urllib.quote(link_to))
 		if description != None: rv += description
============================================================
--- fileinbranch.psp	66e47a474cb46610adc8117eaf45f7fa64d9e88b
+++ fileinbranch.psp	1d3a5d5742dacc82879b558f8e785915653839c0
@@ -60,7 +60,7 @@
 <tr><th>Head revision</th><th>View file</th></tr>
 <%
 	for id in file_version.keys():
-		req.write('<tr><td align="center">%s</td><td align="center">%s</tr>' % (link("revision", id), link("file", [file_version[id], path], "view file")))
+		req.write('<tr><td align="center">%s</td><td align="center">%s</tr>' % (link("revision", id), link("download", [file_version[id], path], "view file")))
 
 %>
 </table>
============================================================
--- manifest.psp	89b19f937c39d159920708dc2cc8c2a80dc2cbec
+++ manifest.psp	d6cec402657f3518eb8017a54a22428644dcc233
@@ -155,13 +155,13 @@
 	icon_uri = get_icon(file)
 	rev = file_to_rev.get(file, None)
 	if not rev:
-		tr.write('<td><img border="0" src="%s" /></td><td>%s</td><td></td><td></td><td></td>' % (icon_uri, link("file", [file_id, file], name)))
+		tr.write('<td><img border="0" src="%s" /></td><td>%s</td><td></td><td></td><td></td>' % (icon_uri, link("file", [revision_id, file], name)))
 	else:
 		age, author, quicklog = revinfo[rev]
 		author = hq(author or "").replace(' ', '&nbsp;')
 		quicklog = hq(quicklog or "")
 		tr.write('<td><img border="0" src="%s" /></td><td>&nbsp;%s</td><td>&nbsp;%s</td><td>&nbsp;%s</td><td>%s</td>' % (icon_uri, \
-				link("file", [file_id, file], name), \
+				link("file", [id, file], name), \
 				link("revision", rev, (age or "").replace(' ', '&nbsp;'), no_quote=True),
 				author, \
 				quicklog))
============================================================
--- revision.psp	9cb020164c77e5a2a33a798d418690d072bc1c3c
+++ revision.psp	54379dc8fb3e0fd02a084fcd92bdb0f41a85de61
@@ -91,10 +91,10 @@
 		if type == "patch":
 			fname, from_id, to_id = stanza[0][1], stanza[1][1], stanza[2][1]
 			if not from_id:
-				value += 'Add file %s with revision %s<br />' % (hq(fname), link("file", [to_id, fname]))
+				value += 'Add file %s with revision %s<br />' % (hq(fname), link("file", [id, fname]))
 			else:
 				# possible bug here; we might need N diff links where N is the number of ancestors
-				value += 'Patch file %s from %s to %s (%s) <br />' % (hq(fname), link("file", [from_id, fname]), link("file", [to_id, fname]), link("diff", [old_revision, id, fname]))
+				value += 'Patch file %s from %s to %s (%s) <br />' % (hq(fname), link("download", [from_id, fname]), link("download", [to_id, fname]), link("diff", [old_revision, id, fname]))
 		elif type == "old_revision":
 			old_revision, old_manifest = stanza[0][1], stanza[1][1]
 			value += 'Old revision is: %s (%s)<br />Old manifest: %s<br />' % (link("revision", old_revision), link("diff", [old_revision, id]), link("manifest", old_revision))
============================================================
--- viewmtn.css	8f34d3d1b7b375830bfbf12ae362a575b2a79385
+++ viewmtn.css	a1b37d9cb0fa5fddaf650dccc25af95bd9597a3f
@@ -37,6 +37,16 @@
 	border-color: black;
 }
 
+TABLE.pretty TD {
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
+
+TABLE.pretty TH {
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
+
 TR.odd {
 	background-color: #eeeeee;
 }