From d95d4970204fcd5c8a237b451867e2398aafa7a1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 28 2015 10:38:23 +0000
Subject: Adjust URL scheme to support branch name containing a '/'


---

diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 43f6b96..85f871d 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -756,9 +756,9 @@ def fork_project(repo, username=None):
     return flask.redirect(flask.url_for('view_repo', repo=repo.name))
 
 
-@APP.route('/<repo>/diff/<branch_to>..<branch_from>',
+@APP.route('/<repo>/diff/<path:branch_to>..<path:branch_from>',
            methods=('GET', 'POST'))
-@APP.route('/fork/<username>/<repo>/diff/<branch_to>..<branch_from>',
+@APP.route('/fork/<username>/<repo>/diff/<path:branch_to>..<path:branch_from>',
            methods=('GET', 'POST'))
 @cla_required
 def new_request_pull(repo, branch_to, branch_from, username=None):
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index f8aa621..4a37a2d 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -297,8 +297,8 @@ def view_commits(repo, branchname=None, username=None):
     )
 
 
-@APP.route('/<repo>/blob/<identifier>/f/<path:filename>')
-@APP.route('/fork/<username>/<repo>/blob/<identifier>/f/<path:filename>')
+@APP.route('/<repo>/blob/<path:identifier>/f/<path:filename>')
+@APP.route('/fork/<username>/<repo>/blob/<path:identifier>/f/<path:filename>')
 def view_file(repo, identifier, filename, username=None):
     """ Displays the content of a file or a tree for the specified repo.
     """
@@ -387,11 +387,11 @@ def view_file(repo, identifier, filename, username=None):
     )
 
 
-@APP.route('/<repo>/raw/<identifier>', defaults={'filename': None})
-@APP.route('/<repo>/raw/<identifier>/f/<path:filename>')
-@APP.route('/fork/<username>/<repo>/raw/<identifier>',
+@APP.route('/<repo>/raw/<path:identifier>', defaults={'filename': None})
+@APP.route('/<repo>/raw/<path:identifier>/f/<path:filename>')
+@APP.route('/fork/<username>/<repo>/raw/<path:identifier>',
            defaults={'filename': None})
-@APP.route('/fork/<username>/<repo>/raw/<identifier>/f/<path:filename>')
+@APP.route('/fork/<username>/<repo>/raw/<path:identifier>/f/<path:filename>')
 def view_raw_file(repo, identifier, filename=None, username=None):
     """ Displays the raw content of a file of a commit for the specified repo.
     """