# 
# 
# patch "error.psp"
#  from [86698bf03d1ef29f0693747d5bb2861969317bf8]
#    to [ee78379923266d98c8538cc406dc7fb8192af069]
# 
# patch "fileinbranch.psp"
#  from [1a5ec0aa9530386210ccb93413817ff2772bad69]
#    to [5d8536100fdf51d505b6f20bc9c16aa78d4e86a8]
# 
# patch "headofbranch.psp"
#  from [10181f7970817021dd721e9da72d9b06cc8ee9a1]
#    to [981df124a0b5655a9f78c42504cfa8c6f02b267a]
# 
# patch "help.psp"
#  from [69f5d6ad53fe27808ef2841c2839816ba8f175ec]
#    to [a43d0588a69e622b2afc681678c2a5c3b3b1f342]
# 
# patch "index.psp"
#  from [7e7615f64309e31945a470f377f0acdf5e8ae832]
#    to [19b8a89de9774bc20097d87e7b8e65c8f1939e2c]
# 
# patch "revision.psp"
#  from [6f463be44003bf7015196427c19b940a52be7cb1]
#    to [6cfbc6f38ea625d769b9d08f408b712b65704121]
# 
# patch "tags.psp"
#  from [df24079a00706530ae62c60e9224dddaf048b25c]
#    to [638140d6823eee5844de37d985773be75707fa25]
# 
# patch "tarofbranch.psp"
#  from [7559dc9f90f183396c4dff99903f5ea1f12e01cc]
#    to [be83f459a152ffd49d89d69555f870291bc85311]
# 
# patch "wrapper.py"
#  from [c5ff5ec5ea7868257307f1cf0731868986d38772]
#    to [9ada4ee3f2078bda572f277642ef1c5fcce150c1]
# 
============================================================
--- error.psp	86698bf03d1ef29f0693747d5bb2861969317bf8
+++ error.psp	ee78379923266d98c8538cc406dc7fb8192af069
@@ -6,9 +6,6 @@
 
 <%
 
-import common
-hq = common.html_escape()
-
 # now; if they raised a plain Exception() then we shall display a simple error 
 # message without a traceback: this is an intentionally raised Exception rather than 
 # a program error
============================================================
--- fileinbranch.psp	1a5ec0aa9530386210ccb93413817ff2772bad69
+++ fileinbranch.psp	5d8536100fdf51d505b6f20bc9c16aa78d4e86a8
@@ -50,7 +50,6 @@
 if unique:
 	psp.redirect("getfile.py?id=%s&path=%s" % (urllib.quote(values[0]), urllib.quote(path)))
 else:
-	hq = common.html_escape()
 	info = {'title' : "Latest version of %s in branch %s" % (hq(path), hq(branch))}
 	req.write(template.header(info))
 %>
============================================================
--- headofbranch.psp	10181f7970817021dd721e9da72d9b06cc8ee9a1
+++ headofbranch.psp	981df124a0b5655a9f78c42504cfa8c6f02b267a
@@ -1,8 +1,5 @@
 <%
 
-import config
-import monotone
-import common
 import urllib
 from common import link
 
@@ -30,7 +27,6 @@
 	id = heads[0]
 	psp.redirect("revision.psp?id=%s" % (urllib.quote(id)))
 else:
-	hq = common.html_escape()
 	info = {'title' : "Branch details for %s" % (hq(branch))}
 	req.write(template.header(info))
 %>
============================================================
--- help.psp	69f5d6ad53fe27808ef2841c2839816ba8f175ec
+++ help.psp	a43d0588a69e622b2afc681678c2a5c3b3b1f342
@@ -1,14 +1,9 @@
 <%
 
-import config
-import common
-import urllib
-
 psp.set_error_page("error.psp")
 info = { 'title' : "Help" }
 req.write(template.header(info))
 
-hq = common.html_escape()
 %>
 
 <p>
============================================================
--- index.psp	7e7615f64309e31945a470f377f0acdf5e8ae832
+++ index.psp	19b8a89de9774bc20097d87e7b8e65c8f1939e2c
@@ -7,7 +7,6 @@
 info = { 'title' : "Branches" }
 req.write(template.header(info))
 
-hq = common.html_escape()
 branches = mt.branches()
 
 %>
============================================================
--- revision.psp	6f463be44003bf7015196427c19b940a52be7cb1
+++ revision.psp	6cfbc6f38ea625d769b9d08f408b712b65704121
@@ -22,7 +22,6 @@
 if not monotone.is_valid_id(id):
 	raise Exception("Specified revision ID is not valid.")
 
-hq = common.html_escape()
 info = {'title' : "Revision %s" % (hq(id))}
 req.write(template.header(info))
 
============================================================
--- tags.psp	df24079a00706530ae62c60e9224dddaf048b25c
+++ tags.psp	638140d6823eee5844de37d985773be75707fa25
@@ -1,16 +1,11 @@
 <%
 
-import config
-import monotone
-import common
-import urllib
 from common import link
 
 psp.set_error_page("error.psp")
 info = { 'title' : "Tags" }
 req.write(template.header(info))
 
-hq = common.html_escape()
 tags = mt.tags()
 
 %>
============================================================
--- tarofbranch.psp	7559dc9f90f183396c4dff99903f5ea1f12e01cc
+++ tarofbranch.psp	be83f459a152ffd49d89d69555f870291bc85311
@@ -1,7 +1,5 @@
 <%
 
-import monotone
-import common
 import urllib
 from common import link
 
@@ -25,7 +23,6 @@
 	manifest_id = revision['new_manifest'][0][0][1]
 	psp.redirect("gettar.py?id=%s" % (urllib.quote(manifest_id)))
 else:
-	hq = common.html_escape()
 	info = {'title' : "Latest tar file of branch %s" % (hq(branch))}
 	req.write(template.header(info))
 %>
============================================================
--- wrapper.py	c5ff5ec5ea7868257307f1cf0731868986d38772
+++ wrapper.py	9ada4ee3f2078bda572f277642ef1c5fcce150c1
@@ -1,11 +1,12 @@
 
 from mod_python import apache,psp,util
-import config
+import mimetypes
 import monotone
-import mimetypes
-import urllib
 import os.path
 import tarfile
+import common
+import config
+import urllib
 import os
 import re
 
@@ -121,6 +122,7 @@
 			req.content_type = "text/html"
 			vars = { 
 				'mt' : Monotone(config.monotone, config.dbfile),
+				'hq' : common.html_escape(),
 				'template' : Template()
 			}
 			req.register_cleanup(cleanup, (req, vars))