diff options
| -rwxr-xr-x | git-arr | 7 | ||||
| -rw-r--r-- | views/blob.html | 8 |
2 files changed, 7 insertions, 8 deletions
@@ -231,8 +231,6 @@ def commit(repo, cid): @bottle.view('blob') @with_utils def blob(repo, bname, fname, dirname = ''): - r = repo.new_in_branch(bname) - if dirname and not dirname.endswith('/'): dirname = dirname + '/' @@ -240,11 +238,12 @@ def blob(repo, bname, fname, dirname = ''): fname = git.smstr.from_url(fname) path = dirname.raw + fname.raw - content = r.blob(path) + content = repo.blob(path, bname) if content is None: bottle.abort(404, "File %r not found in branch %s" % (path, bname)) - return dict(repo = r, dirname = dirname, fname = fname, blob = content) + return dict(repo = repo, branch = bname, dirname = dirname, fname = fname, + blob = content) @bottle.route('/r/<repo:repo>/b/<bname:path>/t/') @bottle.route('/r/<repo:repo>/b/<bname:path>/t/<dirname:path>/') diff --git a/views/blob.html b/views/blob.html index ef20328..c937b37 100644 --- a/views/blob.html +++ b/views/blob.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 » {{repo.name}} » - {{repo.branch}} » {{dirname.unicode}}/{{fname.unicode}}</title> + {{branch}} » {{dirname.unicode}}/{{fname.unicode}}</title> <link rel="stylesheet" type="text/css" href="{{relroot}}../../../../../static/git-arr.css"/> <link rel="stylesheet" type="text/css" @@ -22,12 +22,12 @@ <body class="tree"> <h1><a href="{{relroot}}../../../../../">git</a> » <a href="{{relroot}}../../../">{{repo.name}}</a> » - <a href="{{reltree}}../">{{repo.branch}}</a> » + <a href="{{reltree}}../">{{branch}}</a> » <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: |