#
#
# patch "ChangeLog"
#  from [a90102fbf7b5d7be6c5d553f362389c465267832]
#    to [87fb5200d9a933a3be459d1a27c458a4b2482693]
# 
# patch "templates/branch.html"
#  from [9b84a47baffe133624433db124e92d70a206bb6a]
#    to [b69ea4961e6850301e711aea1d7323661e347b4e]
# 
# patch "viewmtn.py"
#  from [1dc5caa196fe72d70fa67baaad7ed79f3a430868]
#    to [f2271992cc284888cd4654aae410417991b5c4af]
#
============================================================
--- ChangeLog	a90102fbf7b5d7be6c5d553f362389c465267832
+++ ChangeLog	87fb5200d9a933a3be459d1a27c458a4b2482693
@@ -1,3 +1,8 @@
+2006-12-11  Matthew Nicholson  <address@hidden>
+
+	* templates/branch.html: Support branch names with '/' in them.
+	* viewmtn.py: Support branch names with '/' in them.
+
 2006-10-26  Grahame Bowland  <address@hidden>
 
 	* release 0.06
============================================================
--- templates/branch.html	9b84a47baffe133624433db124e92d70a206bb6a
+++ templates/branch.html	b69ea4961e6850301e711aea1d7323661e347b4e
@@ -1,9 +1,9 @@
 #extends base
 
 #def extramenu
 <strong>Branch $branch.name</strong>:
-<a href="$dynamic_join('branch/changes/%s' % $branch.name)">Changes</a> |
-<a href="$dynamic_join('branch/head/info/%s' % $branch.name)">Head revision</a>
+<a href="$dynamic_join('branch/changes/%s' % $urllib_quote($branch.name, safe=''))">Changes</a> |
+<a href="$dynamic_join('branch/head/info/%s' % $urllib_quote($branch.name, safe=''))">Head revision</a>
 #end def
 
 #def rssheaders
============================================================
--- viewmtn.py	1dc5caa196fe72d70fa67baaad7ed79f3a430868
+++ viewmtn.py	f2271992cc284888cd4654aae410417991b5c4af
@@ -141,9 +141,9 @@ class BranchLink(Link):
         Link.__init__(*(self, ), **kwargs)
         from_change, to_change = kwargs.get('from_change'), kwargs.get('to_change')
         if from_change and to_change:
-            self.relative_uri = 'branch/changes/%s/from/%d/to/%d' % (urllib.quote(branch.name), from_change, to_change)
+            self.relative_uri = 'branch/changes/%s/from/%d/to/%d' % (urllib.quote(branch.name, safe = ''), from_change, to_change)
         else:
-            self.relative_uri = 'branch/changes/' + urllib.quote(branch.name)
+            self.relative_uri = 'branch/changes/' + urllib.quote(branch.name, safe = '')
         self.description = hq(branch.name)
 
 class DiffLink(Link):
@@ -292,6 +292,7 @@ class Renderer:
             'context' : web.context, # fugly
             'dynamic_uri_path' : config.dynamic_uri_path, 
             'dynamic_join' : dynamic_join,
+	    'urllib_quote' : urllib.quote,
             'static_uri_path' : config.static_uri_path,
             'static_join' : static_join,
             'link' : link,
@@ -952,7 +953,7 @@ class BranchHead:
             web.redirect(proxyurl(heads[0]))
         else:
             # present an option to the user to choose the head
-            anyhead = '<a href="%s">link</a>' % (dynamic_join('/branch/anyhead/' + proxy_to + '/' + branch.name))
+            anyhead = '<a href="%s">link</a>' % (dynamic_join('/branch/anyhead/' + proxy_to + '/' + urllib.quote(branch.name, safe = '')))
             head_links = []
             for revision in heads:
                 author, date = '', ''