From 8edff291f17ce3e0899f9d5993443e4886e2bda1 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 00:15:20 -0500
Subject: [PATCH 1/9] Added a browse function

---
 browser/vcs.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/browser/vcs.py b/browser/vcs.py
index 84ca734..cc06e67 100644
--- a/browser/vcs.py
+++ b/browser/vcs.py
@@ -176,6 +176,26 @@ class Git(VCS):
                     diff.b_blob.data_stream.read())
             result.append(d)
         return result
+    def browse(self, commit=None, path=''):
+        if not commit:
+            commit = self.ref()
+        files = []
+        dirs = []
 
+        # Locate the tree matching the requested path
+        tree = self._repo.commit(commit).tree
+        if path:
+            for i in tree.traverse():
+                if type(i) == git.objects.Tree and i.path == path:
+                    tree = i
+        if path != tree.path:
+            raise Exception('Path not found')
+
+        for node in tree:
+            if type(node) == git.objects.Blob:
+                files.append(node.path)
+            elif type(node) == git.objects.Tree:
+                dirs.append(node.path)
+        return dirs, files
 if __name__ == '__main__':
     g = Git('/home/correlr/code/voiceaxis')

From e7285b23249f7b03ee1a35224fde21a4cb44ba18 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 00:48:29 -0500
Subject: [PATCH 2/9] Added a navigation sidebar

---
 media/default.css              | 9 +++++++++
 templates/browser/log.html     | 6 +++++-
 templates/dashboard/index.html | 2 +-
 templates/layouts/default.html | 2 ++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/media/default.css b/media/default.css
index 87c38e4..c5ed04d 100644
--- a/media/default.css
+++ b/media/default.css
@@ -5,6 +5,15 @@ body, th, td {
 a {
     color: black;
 }
+div.navigation {
+    width: 200px;
+    float: left;
+    background-color: #ddd;
+}
+div.content {
+    margin-left: 200px;
+    background-color: #eee;
+}
 span.marker {
     display: block;
     float: left;
diff --git a/templates/browser/log.html b/templates/browser/log.html
index 76d5908..441fbd3 100644
--- a/templates/browser/log.html
+++ b/templates/browser/log.html
@@ -1,7 +1,11 @@
 {% extends "layouts/default.html" %}
 {% load gravatar %}
-
 {% load vcs %}
+
+{% block navigation %}
+{% include "browser/navigation.html" %}
+{% endblock %}
+
 {% block content %}
 <h2>Commit Log</h2>
 Branches:
diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index 9076031..055dee2 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default.html" %}
 
-{% block content %}
+{% block navigation %}
 <h2>Repositories</h2>
 
 <ul>
diff --git a/templates/layouts/default.html b/templates/layouts/default.html
index 6f8b759..9210fa6 100644
--- a/templates/layouts/default.html
+++ b/templates/layouts/default.html
@@ -11,6 +11,8 @@
                 <h1><a href="{% url codereview.dashboard.views.index %}">CodeReview</a></title>
             </div>
             <div class="navigation">
+                {% block navigation %}
+                {% endblock %}
             </div>
             <div class="content">
                 {% block content %}

From 981150f90177d2d904d3e4776497bef3af264169 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 01:13:50 -0500
Subject: [PATCH 3/9] Added paths to log view

---
 browser/urls.py  |  2 +-
 browser/vcs.py   |  2 +-
 browser/views.py | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/browser/urls.py b/browser/urls.py
index 8e2468a..92f3d6f 100644
--- a/browser/urls.py
+++ b/browser/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
-    (r'^(?P<repository>.*?)/log/$', 'codereview.browser.views.log'),
+    (r'^(?P<repository>.*?)/log/(?P<path>(.*?/)+)?$', 'codereview.browser.views.log'),
     (r'^(?P<repository>.*?)/view/(?P<ref>.*?)/$', 'codereview.browser.views.view'),
 )
diff --git a/browser/vcs.py b/browser/vcs.py
index 9b69158..782da36 100644
--- a/browser/vcs.py
+++ b/browser/vcs.py
@@ -144,7 +144,7 @@ class Git(VCS):
     def log(self, commit=None, path=None, max=50, offset=0):
         commit = commit if commit else self._ref
         result = []
-        for c in self._repo.iter_commits(commit, path, max_count=max,
+        for c in self._repo.iter_commits(rev=commit, paths=path, max_count=max,
                 skip=offset):
             result.append(self.commit(c))
         return result
diff --git a/browser/views.py b/browser/views.py
index 7c929f9..61f4f84 100755
--- a/browser/views.py
+++ b/browser/views.py
@@ -1,9 +1,10 @@
+import os
 from django.http import Http404
 from django.shortcuts import render_to_response
 from codereview.dashboard.models import Repository
 from codereview.browser import vcs
 
-def log(request,repository):
+def log(request,repository, path=None):
     try:
         repository = Repository.objects.get(name=repository)
     except:
@@ -12,7 +13,10 @@ def log(request,repository):
     ref = request.GET['c'] if 'c' in request.GET else repo.ref()
     offset = int(request.GET['o']) if 'o' in request.GET else 0
     limit = 20
-    log = repo.log(ref, max=limit, offset=offset)
+
+    path = os.path.dirname(path) if path else ''
+    log = repo.log(ref, path=path, max=limit, offset=offset)
+    navigation = dict(zip(('dirs', 'files'), repo.browse()))
 
     newer = offset - limit if offset > limit else 0
     # Inspect the last commit. If it has no parents, we can't go any further
@@ -23,8 +27,10 @@ def log(request,repository):
     return render_to_response('browser/log.html',
             {
                 'repository': repository,
+                'path': path,
                 'repo': repo,
                 'log': log,
+                'navigation': navigation,
                 'ref': ref,
                 'offset': offset,
                 'newer': newer,

From eafa3947b9c752597ad19047948a1dbbf5afda68 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 01:14:06 -0500
Subject: [PATCH 4/9] Committed missing navigation template

---
 templates/browser/navigation.html | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 templates/browser/navigation.html

diff --git a/templates/browser/navigation.html b/templates/browser/navigation.html
new file mode 100644
index 0000000..6a71ff0
--- /dev/null
+++ b/templates/browser/navigation.html
@@ -0,0 +1,9 @@
+<h2><a href="{% url codereview.browser.views.log repository=repository.name %}">{{ repository.name }}</a></h2>
+<ul class="tree">
+    {% for dir in navigation.dirs %}
+        <li class="dir">{{ dir }}</li>
+    {% endfor %}
+    {% for file in navigation.files %}
+        <li class="file">{{ file }}</li>
+    {% endfor %}
+</ul>

From 753b942d6620056a978ab1c86ac0d327266ff375 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 09:50:41 -0500
Subject: [PATCH 5/9] Added some browsing abilities

---
 browser/templatetags/vcs.py       | 11 +++++++++++
 browser/urls.py                   |  3 ++-
 browser/views.py                  |  4 ++--
 media/default.css                 | 11 +++++++++--
 templates/browser/navigation.html | 17 +++++++++++++++--
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/browser/templatetags/vcs.py b/browser/templatetags/vcs.py
index 6f738c3..fd12105 100644
--- a/browser/templatetags/vcs.py
+++ b/browser/templatetags/vcs.py
@@ -1,3 +1,4 @@
+import os
 from django.template import Library
 from django.template.defaultfilters import stringfilter
 
@@ -8,3 +9,13 @@ register = Library()
 def oneline(value):
     line = value.split('\n')[0].strip()
     return line
+
+@register.filter
+@stringfilter
+def dirname(value):
+    return os.path.dirname(value)
+
+@register.filter
+@stringfilter
+def basename(value):
+    return os.path.basename(value)
diff --git a/browser/urls.py b/browser/urls.py
index 92f3d6f..b37f950 100644
--- a/browser/urls.py
+++ b/browser/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
-    (r'^(?P<repository>.*?)/log/(?P<path>(.*?/)+)?$', 'codereview.browser.views.log'),
+    (r'^(?P<repository>.*?)/log/$', 'codereview.browser.views.log'),
+    (r'^(?P<repository>.*?)/log/(?P<path>.*?/?)$', 'codereview.browser.views.log'),
     (r'^(?P<repository>.*?)/view/(?P<ref>.*?)/$', 'codereview.browser.views.view'),
 )
diff --git a/browser/views.py b/browser/views.py
index 61f4f84..a33510d 100755
--- a/browser/views.py
+++ b/browser/views.py
@@ -14,9 +14,9 @@ def log(request,repository, path=None):
     offset = int(request.GET['o']) if 'o' in request.GET else 0
     limit = 20
 
-    path = os.path.dirname(path) if path else ''
+    path = path if path else ''
     log = repo.log(ref, path=path, max=limit, offset=offset)
-    navigation = dict(zip(('dirs', 'files'), repo.browse()))
+    navigation = dict(zip(('dirs', 'files'), repo.browse(ref, os.path.dirname(path))))
 
     newer = offset - limit if offset > limit else 0
     # Inspect the last commit. If it has no parents, we can't go any further
diff --git a/media/default.css b/media/default.css
index c5ed04d..d5dc724 100644
--- a/media/default.css
+++ b/media/default.css
@@ -6,14 +6,21 @@ a {
     color: black;
 }
 div.navigation {
-    width: 200px;
+    width: 300px;
     float: left;
     background-color: #ddd;
+    overflow: hidden;
 }
 div.content {
-    margin-left: 200px;
+    margin-left: 300px;
     background-color: #eee;
 }
+ul.tree li.dir {
+    list-style-type: circle;
+}
+ul.tree li.file {
+    list-style-type: square;
+}
 span.marker {
     display: block;
     float: left;
diff --git a/templates/browser/navigation.html b/templates/browser/navigation.html
index 6a71ff0..b5a9cf1 100644
--- a/templates/browser/navigation.html
+++ b/templates/browser/navigation.html
@@ -1,9 +1,22 @@
+{% load vcs %}
 <h2><a href="{% url codereview.browser.views.log repository=repository.name %}">{{ repository.name }}</a></h2>
+{% if path|dirname %}
+    <strong>{{ path|dirname }}/</strong><br />
+    <a href="{% url codereview.browser.views.log repository=repository.name path=path|dirname %}">Up one</a>
+{% endif %}
 <ul class="tree">
     {% for dir in navigation.dirs %}
-        <li class="dir">{{ dir }}</li>
+    <li class="dir">
+        <a href="{% url codereview.browser.views.log repository=repository.name path=dir %}/">{{ dir|basename }}</a>
+    </li>
     {% endfor %}
     {% for file in navigation.files %}
-        <li class="file">{{ file }}</li>
+    <li class="file">
+        {% if file == path %}
+            <strong>{{ file|basename }}</strong>
+        {% else %}
+            <a href="{% url codereview.browser.views.log repository=repository.name path=file %}">{{ file|basename }}</a>
+        {% endif %}
+    </li>
     {% endfor %}
 </ul>

From 00f020d24adcbf2520366561aadf2b5641e91a59 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 09:58:10 -0500
Subject: [PATCH 6/9] Added current ref to the navigation urls

---
 templates/browser/navigation.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/browser/navigation.html b/templates/browser/navigation.html
index b5a9cf1..ee5a535 100644
--- a/templates/browser/navigation.html
+++ b/templates/browser/navigation.html
@@ -1,13 +1,13 @@
 {% load vcs %}
-<h2><a href="{% url codereview.browser.views.log repository=repository.name %}">{{ repository.name }}</a></h2>
+<h2><a href="{% url codereview.browser.views.log repository=repository.name %}?c={{ ref }}">{{ repository.name }}</a></h2>
 {% if path|dirname %}
     <strong>{{ path|dirname }}/</strong><br />
-    <a href="{% url codereview.browser.views.log repository=repository.name path=path|dirname %}">Up one</a>
+    <a href="{% url codereview.browser.views.log repository=repository.name path=path|dirname %}?c={{ ref }}">Up one</a>
 {% endif %}
 <ul class="tree">
     {% for dir in navigation.dirs %}
     <li class="dir">
-        <a href="{% url codereview.browser.views.log repository=repository.name path=dir %}/">{{ dir|basename }}</a>
+        <a href="{% url codereview.browser.views.log repository=repository.name path=dir %}/?c={{ ref }}">{{ dir|basename }}</a>
     </li>
     {% endfor %}
     {% for file in navigation.files %}
@@ -15,7 +15,7 @@
         {% if file == path %}
             <strong>{{ file|basename }}</strong>
         {% else %}
-            <a href="{% url codereview.browser.views.log repository=repository.name path=file %}">{{ file|basename }}</a>
+            <a href="{% url codereview.browser.views.log repository=repository.name path=file %}?c={{ ref }}">{{ file|basename }}</a>
         {% endif %}
     </li>
     {% endfor %}

From 223cc9aee6ea6398573c04744512223f01a4243b Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 10:03:05 -0500
Subject: [PATCH 7/9] Moved branch selection to the navigation template

---
 templates/browser/log.html        |  6 ------
 templates/browser/navigation.html | 13 +++++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/templates/browser/log.html b/templates/browser/log.html
index 441fbd3..3f2ce32 100644
--- a/templates/browser/log.html
+++ b/templates/browser/log.html
@@ -8,12 +8,6 @@
 
 {% block content %}
 <h2>Commit Log</h2>
-Branches:
-<ul>
-{% for branch, commit in repo.branches.items %}
-<li><a href="{% url codereview.browser.views.log repository=repository.name %}?c={{branch}}">{{ branch }}</a> ({{commit.id}})</li>
-{% endfor %}
-</ul>
 <table class="vcs-log">
     <tr>
         <th>Commit Date</th>
diff --git a/templates/browser/navigation.html b/templates/browser/navigation.html
index ee5a535..a1b689d 100644
--- a/templates/browser/navigation.html
+++ b/templates/browser/navigation.html
@@ -1,5 +1,18 @@
 {% load vcs %}
 <h2><a href="{% url codereview.browser.views.log repository=repository.name %}?c={{ ref }}">{{ repository.name }}</a></h2>
+<h3>Branches</h3>
+<ul>
+    {% for branch, commit in repo.branches.items %}
+    <li>
+        {% if ref == branch or ref == commit.id %}
+            <strong>{{ branch }}</strong>
+        {% else %}
+            <a href="{% url codereview.browser.views.log repository=repository.name %}?c={{branch}}">{{ branch }}</a>
+        {% endif %}
+    </li>
+    {% endfor %}
+</ul>
+<h3>Browse</h3>
 {% if path|dirname %}
     <strong>{{ path|dirname }}/</strong><br />
     <a href="{% url codereview.browser.views.log repository=repository.name path=path|dirname %}?c={{ ref }}">Up one</a>

From 0ff44c338124e19a1051df010cdfa1396c786158 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 10:04:56 -0500
Subject: [PATCH 8/9] Got rid of the navigation background colors

---
 dashboard/fixtures/localrepos.json | 9 +++++++++
 media/default.css                  | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dashboard/fixtures/localrepos.json b/dashboard/fixtures/localrepos.json
index f8a43ef..f15b58e 100644
--- a/dashboard/fixtures/localrepos.json
+++ b/dashboard/fixtures/localrepos.json
@@ -16,5 +16,14 @@
             "type": 0, 
             "name": "MTG"
         }
+    },
+    {
+        "pk": 3, 
+        "model": "dashboard.repository", 
+        "fields": {
+            "path": "/srv/git/codereview.git", 
+            "type": 0, 
+            "name": "CodeReview"
+        }
     }
 ]
diff --git a/media/default.css b/media/default.css
index d5dc724..89d61bb 100644
--- a/media/default.css
+++ b/media/default.css
@@ -8,12 +8,10 @@ a {
 div.navigation {
     width: 300px;
     float: left;
-    background-color: #ddd;
     overflow: hidden;
 }
 div.content {
     margin-left: 300px;
-    background-color: #eee;
 }
 ul.tree li.dir {
     list-style-type: circle;

From 16a4bb45e5cd46381cb3e5f425f11874b7d0ca7d Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Mon, 22 Nov 2010 10:12:29 -0500
Subject: [PATCH 9/9] Added navigation to the commit view

---
 templates/browser/view.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/browser/view.html b/templates/browser/view.html
index 803a0d1..299bd50 100644
--- a/templates/browser/view.html
+++ b/templates/browser/view.html
@@ -2,6 +2,10 @@
 {% load gravatar %}
 {% load vcs %}
 
+{% block navigation %}
+{% include "browser/navigation.html" %}
+{% endblock %}
+
 {% block content %}
 <h2>{{ commit.message|oneline }}</h2>