# # # patch "templates/branchchangesrss.html" # from [80c9962a3f4d25f2c87e36ccfd2fb53904bcfa9b] # to [c196a20acd70b012f6279461e0762d5553175d34] # # patch "viewmtn.py" # from [67546da3c7c58a632b12d1f482c0274d7e25e4f3] # to [96a8175936997e11f561ae55beabcc45392b1b56] # ============================================================ --- templates/branchchangesrss.html 80c9962a3f4d25f2c87e36ccfd2fb53904bcfa9b +++ templates/branchchangesrss.html c196a20acd70b012f6279461e0762d5553175d34 @@ -10,7 +10,7 @@ #for $revision, $diffs, $ago, $author, $changelog, $shortlog, $when in $display_revs #filter Filter - $link($branch).uri() + $link($revision).uri() #filter WebSafe $author $shortlog ============================================================ --- viewmtn.py 67546da3c7c58a632b12d1f482c0274d7e25e4f3 +++ viewmtn.py 96a8175936997e11f561ae55beabcc45392b1b56 @@ -872,7 +872,7 @@ class BranchHead: print "Bah." class BranchHead: - def GET(self, head_method, proxy_to, branch): + def GET(self, head_method, proxy_to, branch, extra_path): branch = mtn.Branch(branch) valid = ('browse', 'file', 'downloadfile', 'info', 'tar', 'graph') if not proxy_to in valid: @@ -881,7 +881,7 @@ class BranchHead: if len(heads) == 0: return web.notfound() def proxyurl(revision): - return dynamic_join('/revision/' + proxy_to + '/' + revision) + return dynamic_join('/revision/' + proxy_to + '/' + revision + urllib.quote(extra_path)) if len(heads) == 1 or head_method == 'anyhead': web.redirect(proxyurl(heads[0])) else: @@ -932,11 +932,9 @@ urls = ( # let's make it possible to access any function on the head revision # through this proxy method; it'll return a redirect to the head revision # with the specified function - r'/branch/(head)/([A-Za-z]+)/([^/]+)', 'BranchHead', - r'/branch/(anyhead)/([A-Za-z]+)/([^/]+)', 'BranchHead', + r'/branch/(head)/([A-Za-z]+)/([^/]+)(.*)', 'BranchHead', + r'/branch/(anyhead)/([A-Za-z]+)/([^/]+)(.*)', 'BranchHead', - r'/branch/tar/([^/]+)', 'BranchTar', - r'/static/(.*)', 'Static' )