From 91a7c0366b225e0ec77207163140e42511467931 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 18 2014 16:15:15 +0000
Subject: Revert the change to put the project under the username namespace


Project will be at the top level namespace and only forks will be under the username's namespace
---

diff --git a/progit/app.py b/progit/app.py
index b2731c5..fa87d23 100644
--- a/progit/app.py
+++ b/progit/app.py
@@ -37,22 +37,22 @@ def index():
     limit = APP.config['ITEM_PER_PAGE']
     start = limit * (page - 1)
     end = limit * page
-    users = sorted(os.listdir(APP.config['GIT_FOLDER']))
-    users_length = len(users)
+    repos = sorted(os.listdir(APP.config['GIT_FOLDER']))
+    repos_length = len(repos)
 
-    total_page = int(ceil(users_length / float(limit)))
+    total_page = int(ceil(repos_length / float(limit)))
 
-    users = users[start:end]
+    repos = repos[start:end]
 
     return flask.render_template(
         'index.html',
-        users=users,
+        repos=repos,
         total_page=total_page,
         page=page,
     )
 
 
-@APP.route('/<username>')
+@APP.route('/user/<username>')
 def view_user(username):
     """ Front page of a specific user.
     """
@@ -89,11 +89,11 @@ def view_user(username):
     )
 
 
-@APP.route('/<username>/<repo>')
-def view_repo(username, repo):
+@APP.route('/<repo>')
+def view_repo(repo):
     """ Front page of a specific repo.
     """
-    reponame = os.path.join(APP.config['GIT_FOLDER'], username, repo)
+    reponame = os.path.join(APP.config['GIT_FOLDER'], repo)
     if not os.path.exists(reponame):
         flask.abort(404)
     repo_obj = pygit2.Repository(reponame)
@@ -109,7 +109,6 @@ def view_repo(username, repo):
     return flask.render_template(
         'repo_info.html',
         repo=repo,
-        username=username,
         branches=sorted(repo_obj.listall_branches()),
         branchname='master',
         last_commits=last_commits,
@@ -117,11 +116,11 @@ def view_repo(username, repo):
     )
 
 
-@APP.route('/<username>/<repo>/branch/<branchname>')
-def view_repo_branch(username, repo, branchname):
+@APP.route('/<repo>/branch/<branchname>')
+def view_repo_branch(repo, branchname):
     """ Displays the information about a specific branch.
     """
-    reponame = os.path.join(APP.config['GIT_FOLDER'], username, repo)
+    reponame = os.path.join(APP.config['GIT_FOLDER'], repo)
     if not os.path.exists(reponame):
         flask.abort(404)
     repo_obj = pygit2.Repository(reponame)
@@ -142,7 +141,6 @@ def view_repo_branch(username, repo, branchname):
     return flask.render_template(
         'repo_info.html',
         repo=repo,
-        username=username,
         branches=sorted(repo_obj.listall_branches()),
         branchname=branchname,
         last_commits=last_commits,
@@ -150,12 +148,12 @@ def view_repo_branch(username, repo, branchname):
     )
 
 
-@APP.route('/<username>/<repo>/log')
-@APP.route('/<username>/<repo>/log/<branchname>')
-def view_log(username, repo, branchname=None):
+@APP.route('/<repo>/log')
+@APP.route('/<repo>/log/<branchname>')
+def view_log(repo, branchname=None):
     """ Displays the logs of the specified repo.
     """
-    reponame = os.path.join(APP.config['GIT_FOLDER'], username, repo)
+    reponame = os.path.join(APP.config['GIT_FOLDER'], repo)
     if not os.path.exists(reponame):
         flask.abort(404)
     repo_obj = pygit2.Repository(reponame)
@@ -191,7 +189,6 @@ def view_log(username, repo, branchname=None):
         'repo_info.html',
         origin='view_log',
         repo=repo,
-        username=username,
         branches=sorted(repo_obj.listall_branches()),
         branchname=branchname,
         last_commits=last_commits,
@@ -200,12 +197,12 @@ def view_log(username, repo, branchname=None):
     )
 
 
-@APP.route('/<username>/<repo>/blob/<identifier>/<path:filename>')
-@APP.route('/<username>/<repo>/blob/<identifier>/<path:filename>')
-def view_file(username, repo, identifier, filename):
+@APP.route('/<repo>/blob/<identifier>/<path:filename>')
+@APP.route('/<repo>/blob/<identifier>/<path:filename>')
+def view_file(repo, identifier, filename):
     """ Displays the content of a file or a tree for the specified repo.
     """
-    reponame = os.path.join(APP.config['GIT_FOLDER'], username, repo)
+    reponame = os.path.join(APP.config['GIT_FOLDER'], repo)
     if not os.path.exists(reponame):
         flask.abort(404)
     repo_obj = pygit2.Repository(reponame)
@@ -258,7 +255,6 @@ def view_file(username, repo, identifier, filename):
     return flask.render_template(
         'file.html',
         repo=repo,
-        username=username,
         branchname=branchname,
         filename=filename,
         content=content,
@@ -266,11 +262,11 @@ def view_file(username, repo, identifier, filename):
     )
 
 
-@APP.route('/<username>/<repo>/<commitid>')
-def view_commit(username, repo, commitid):
+@APP.route('/<repo>/<commitid>')
+def view_commit(repo, commitid):
     """ Render a commit in a repo
     """
-    reponame = os.path.join(APP.config['GIT_FOLDER'], username, repo)
+    reponame = os.path.join(APP.config['GIT_FOLDER'], repo)
     if not os.path.exists(reponame):
         flask.abort(404)
     repo_obj = pygit2.Repository(reponame)
@@ -300,7 +296,6 @@ def view_commit(username, repo, commitid):
     return flask.render_template(
         'commit.html',
         repo=repo,
-        username=username,
         commitid=commitid,
         commit=commit,
         diff=diff,
@@ -308,12 +303,12 @@ def view_commit(username, repo, commitid):
     )
 
 
-@APP.route('/<username>/<repo>/tree/')
-@APP.route('/<username>/<repo>/tree/<identifier>')
-def view_tree(username, repo, identifier=None):
+@APP.route('/<repo>/tree/')
+@APP.route('/<repo>/tree/<identifier>')
+def view_tree(repo, identifier=None):
     """ Render the tree of the repo
     """
-    reponame = os.path.join(APP.config['GIT_FOLDER'], username, repo)
+    reponame = os.path.join(APP.config['GIT_FOLDER'], repo)
     if not os.path.exists(reponame):
         flask.abort(404)
     repo_obj = pygit2.Repository(reponame)
@@ -337,7 +332,6 @@ def view_tree(username, repo, identifier=None):
     return flask.render_template(
         'file.html',
         repo=repo,
-        username=username,
         branchname=branchname,
         filename='',
         content=content,
diff --git a/progit/templates/commit.html b/progit/templates/commit.html
index bedbc99..aad4ae5 100644
--- a/progit/templates/commit.html
+++ b/progit/templates/commit.html
@@ -7,12 +7,12 @@
 {% block content %}
 
 <h2>
-  <a href="{{ url_for('view_repo', username=username, repo=repo)}}">
+  <a href="{{ url_for('view_repo', repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
 
   (<a href="{{ url_for('view_tree',
-               username=username, repo=repo, identifier=commitid) }}"
+               repo=repo, identifier=commitid) }}"
     >tree</a>)
 </h2>
 
@@ -38,7 +38,7 @@
     <td>
       {% for parent in commit.parents %}
       <a href="{{ url_for('view_commit',
-                  username=username, repo=repo, commitid=parent.oid.hex) }}">
+                  repo=repo, commitid=parent.oid.hex) }}">
         {{ parent.oid.hex }}
       </a> <br />
       {% endfor %}
diff --git a/progit/templates/file.html b/progit/templates/file.html
index 6de946d..94017d0 100644
--- a/progit/templates/file.html
+++ b/progit/templates/file.html
@@ -8,11 +8,11 @@
 
 <h2>
   <a href="{{ url_for('view_repo',
-              username=username, repo=repo)}}">
+              repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
   : <a href="{{ url_for('view_tree',
-                username=username, repo=repo, identifier=branchname) }}">
+                repo=repo, identifier=branchname) }}">
   {{ branchname }}</a>/{%
   for file in filename.split('/') %}
     {% if loop.first %}
@@ -22,7 +22,7 @@
     {% endif %}
     {% if loop.index != loop.length %}
 <a href="{{ url_for('view_file',
-            username=username, repo=repo, identifier=branchname,
+            repo=repo, identifier=branchname,
             filename=path)}}"
       >{{ file }}</a>/{%
     else %}
@@ -45,7 +45,6 @@
       [ ]
       {% endif %}
       <a href="{{ url_for('view_file',
-                username=username,
                 repo=repo,
                 identifier=branchname,
                 filename=filename + '/' + entry.name if filename else entry.name) }}">
diff --git a/progit/templates/index.html b/progit/templates/index.html
index 5a56a56..eaa1353 100644
--- a/progit/templates/index.html
+++ b/progit/templates/index.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-<h2>...</h2>
+<h2>Projects</h2>
 
 {% if total_page %}
 <table>
@@ -34,12 +34,12 @@
 </table>
 {% endif %}
 
-<section class="user_list">
+<section class="repo_list">
   <ul>
-    {% for user in users %}
+    {% for repo in repos %}
     <li>
-      <a href="{{ url_for('view_user', username=user)}}">
-        {{ user }}
+      <a href="{{ url_for('view_repo', repo=repo)}}">
+        {{ repo }}
       </a>
     </li>
     {% endfor %}
diff --git a/progit/templates/repo_info.html b/progit/templates/repo_info.html
index d896dad..2f947a7 100644
--- a/progit/templates/repo_info.html
+++ b/progit/templates/repo_info.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 <h2>
-  <a href="{{ url_for('view_repo', username=username, repo=repo)}}">
+  <a href="{{ url_for('view_repo', repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
   {% if branchname %} ({{ branchname }}) {% endif %}
@@ -19,11 +19,11 @@
     {% for branch in branches %}
     <li>
       <a href="{{ url_for('view_repo_branch',
-                  username=username, repo=repo, branchname=branch) }}">
+                  repo=repo, branchname=branch) }}">
         {{ branch }}
       </a>
       (<a href="{{ url_for('view_log',
-                   username=username, repo=repo, branchname=branch) }}"
+                   repo=repo, branchname=branch) }}"
         >logs</a>)
     </li>
     {% endfor %}
@@ -36,7 +36,7 @@
         <td>
         {% if page > 1%}
             <a href="{{ url_for('.%s' % origin,
-                        username=username, repo=repo) }}?page={{page - 1}}">
+                        repo=repo) }}?page={{page - 1}}">
                 &lt; Previous
             </a>
         {% else %}
@@ -47,7 +47,7 @@
         <td>
             {% if page < total_page %}
             <a href="{{ url_for('.%s' % origin,
-                        username=username, repo=repo) }}?page={{page + 1}}">
+                        repo=repo) }}?page={{page + 1}}">
                 Next &gt;
             </a>
             {% else %}
@@ -68,7 +68,7 @@
     {% for commit in last_commits %}
     <li>
       <a href="{{ url_for('view_commit',
-                  username=username, repo=repo, commitid=commit.hex) }}">
+                  repo=repo, commitid=commit.hex) }}">
         {{ commit.hex[:6] }}
       </a>
       {{ commit.message.split('\n')[0] }}
@@ -86,7 +86,7 @@
         {% if entry.filemode == 16384 %}
         [ ]
         {% endif %}
-        <a href="{{ url_for('view_file', username=username,
+        <a href="{{ url_for('view_file',
                     repo=repo, identifier=branchname, filename=entry.name) }}">
           {{ entry.name }}
         </a>
diff --git a/progit/templates/user_info.html b/progit/templates/user_info.html
index 7fe34a9..991fce8 100644
--- a/progit/templates/user_info.html
+++ b/progit/templates/user_info.html
@@ -38,7 +38,7 @@
   <ul>
     {% for repo in repos %}
     <li>
-      <a href="{{ url_for('view_repo', username=username, repo=repo)}}">
+      <a href="{{ url_for('view_repo', repo=repo)}}">
         {{ repo.split('.git')[0] }}
       </a>
       <span class="commit_date">