# # # patch "fileinbranch.psp" # from [044caac4a12a1326f3aed19c92078614926368e6] # to [14051e609852522f4eba270632b444fc470768a8] # # patch "headofbranch.psp" # from [7be2770cfdf0a0c364d0d9e3f38a0f7e0d7ebe63] # to [f2f0d9d64ffa71086b2451fa0eb994d40fe35db6] # # patch "tarofbranch.psp" # from [7fcb5ab84ad5b6538d0c64228440cb5acbdd9110] # to [08acdaaf0dbe9111f0053d02b91b4e814c62c798] # ============================================================ --- fileinbranch.psp 044caac4a12a1326f3aed19c92078614926368e6 +++ fileinbranch.psp 14051e609852522f4eba270632b444fc470768a8 @@ -1,7 +1,8 @@ <% import monotone import urllib +import urlparse psp.set_error_page("error.psp") @@ -45,7 +46,7 @@ break last = file_revision if unique: - psp.redirect("getfile.py?id=%s&path=%s" % (urllib.quote(values[0]), urllib.quote(path))) + psp.redirect(urlparse.urljoin(req.uri, "getfile.py?id=%s&path=%s" % (urllib.quote(values[0]), urllib.quote(path)))) else: info = {'title' : "Latest version of %s in branch %s" % (hq(path), hq(branch))} req.write(template.header(info)) ============================================================ --- headofbranch.psp 7be2770cfdf0a0c364d0d9e3f38a0f7e0d7ebe63 +++ headofbranch.psp f2f0d9d64ffa71086b2451fa0eb994d40fe35db6 @@ -1,6 +1,7 @@ <% import urllib +import urlparse psp.set_error_page("error.psp") @@ -24,7 +25,7 @@ elif len(heads) == 1: # a single head ID; redirect to it id = heads[0] - psp.redirect("revision.psp?id=%s" % (urllib.quote(id))) + psp.redirect(urlparse.urljoin(req.uri, "revision.psp?id=%s" % (urllib.quote(id)))) else: info = {'title' : "Branch details for %s" % (hq(branch))} req.write(template.header(info)) ============================================================ --- tarofbranch.psp 7fcb5ab84ad5b6538d0c64228440cb5acbdd9110 +++ tarofbranch.psp 08acdaaf0dbe9111f0053d02b91b4e814c62c798 @@ -1,6 +1,7 @@ <% import urllib +import urlparse psp.set_error_page("error.psp") @@ -20,7 +21,7 @@ elif len(heads) == 1: revision = mt.revision(heads[0]) manifest_id = revision['new_manifest'][0][1] - psp.redirect("gettar.py?id=%s" % (urllib.quote(manifest_id))) + psp.redirect(urlparse.urljoin(req.uri, "gettar.py?id=%s" % (urllib.quote(manifest_id)))) else: info = {'title' : "Latest tar file of branch %s" % (hq(branch))} req.write(template.header(info))