git » git-arr » commit e6099cf

tree: pass branch name to view explicitly

author Eric Sunshine
2015-01-14 07:46:32 UTC
committer Alberto Bertogli
2015-01-17 13:11:27 UTC
parent 46640c68b9758b3c76d6a81d5a7c8601b6c4b5ee
tree: pass branch name to view explicitly

Passing the branch name into the view indirectly via
Repo.new_in_branch() increases cognitive burden, thus outweighing
whatever minor convenience (if any) is gained by doing so. The code is
easier to reason about when the branch name is passed to the view
directly.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
git-arr +2 -2
views/tree.html +4 -4 
diff --git a/git-arr b/git-arr
index ae509ea..ce8ef30 100755
--- a/git-arr
+++ b/git-arr
@@ -256,8 +256,8 @@ def tree(repo, bname, dirname = ''):
 
     dirname = git.smstr.from_url(dirname)
 
-    r = repo.new_in_branch(bname)
-    return dict(repo = r, tree = r.tree(), dirname = dirname)
+    return dict(repo = repo, branch = bname, tree = repo.tree(bname),
+                dirname = dirname)
 
 @bottle.route('/r/<repo:repo>/b/<bname:path>/')
 @bottle.route('/r/<repo:repo>/b/<bname:path>/<offset:int>.html')
diff --git a/views/tree.html b/views/tree.html
index f983b75..68a5844 100644
--- a/views/tree.html
+++ b/views/tree.html
@@ -8,10 +8,10 @@
 % else:
 %     reltree = '../' * (len(dirname.split('/')) - 1)
 % end
-% relroot = reltree + '../' * (len(repo.branch.split('/')) - 1)
+% relroot = reltree + '../' * (len(branch.split('/')) - 1)
 
 <title>git &raquo; {{repo.name}} &raquo;
-    {{repo.branch}} &raquo; {{dirname.unicode}}</title>
+    {{branch}} &raquo; {{dirname.unicode}}</title>
 <link rel="stylesheet" type="text/css"
     href="{{relroot}}../../../../../static/git-arr.css"/>
 <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
@@ -20,12 +20,12 @@
 <body class="tree">
 <h1><a href="{{relroot}}../../../../../">git</a> &raquo;
     <a href="{{relroot}}../../../">{{repo.name}}</a> &raquo;
-    <a href="{{reltree}}../">{{repo.branch}}</a> &raquo;
+    <a href="{{reltree}}../">{{branch}}</a> &raquo;
     <a href="{{reltree}}">tree</a>
 </h1>
 
 <h3>
-    <a href="{{reltree}}">[{{repo.branch}}]</a> /
+    <a href="{{reltree}}">[{{branch}}]</a> /
 % base = smstr(reltree)
 % for c in dirname.split('/'):
 %   if not c.raw: