M gitsrht/blueprints/artifacts.py => gitsrht/blueprints/artifacts.py +3 -2
@@ 41,15 41,16 @@ def ref_upload(owner, repo, ref):
valid = Validation(request)
f = request.files.get("file")
valid.expect(f, "File is required", field="file")
+ default_branch = git_repo.default_branch()
if not valid.ok:
return render_template("ref.html", view="refs",
owner=owner, repo=repo, git_repo=git_repo, tag=tag,
- **valid.kwargs)
+ default_branch=default_branch, **valid.kwargs)
artifact = upload_artifact(valid, repo, target, f, f.filename)
if not valid.ok:
return render_template("ref.html", view="refs",
owner=owner, repo=repo, git_repo=git_repo, tag=tag,
- **valid.kwargs)
+ default_branch=default_branch, **valid.kwargs)
db.session.commit()
return redirect(url_for("repo.ref",
owner=owner.canonical_name,
M gitsrht/blueprints/repo.py => gitsrht/blueprints/repo.py +7 -5
@@ 417,7 417,8 @@ def commit(owner, repo, ref):
return render_template("commit.html", view="log",
owner=owner, repo=repo, ref=ref, refs=refs,
commit=commit, parent=parent,
- diff=diff, diffstat=diffstat, pygit2=pygit2)
+ diff=diff, diffstat=diffstat, pygit2=pygit2,
+ default_branch=git_repo.default_branch())
@repo.route("/<owner>/<repo>/commit/<path:ref>.patch")
def patch(owner, repo, ref):
@@ 469,9 470,9 @@ def refs(owner, repo):
git_repo.branches[branch],
git_repo.get(git_repo.branches[branch].target)
) for branch in git_repo.branches.local]
- default_branch = git_repo.default_branch().name
+ default_branch = git_repo.default_branch()
branches = sorted(branches,
- key=lambda b: (b[1].name == default_branch, b[2].commit_time),
+ key=lambda b: (b[1].name == default_branch.name, b[2].commit_time),
reverse=True)
results_per_page = 10
@@ 493,7 494,8 @@ def refs(owner, repo):
return render_template("refs.html", view="refs",
owner=owner, repo=repo, tags=tags, branches=branches,
git_repo=git_repo, isinstance=isinstance, pygit2=pygit2,
- page=page + 1, total_pages=total_pages)
+ page=page + 1, total_pages=total_pages,
+ default_branch=default_branch)
@repo.route("/<owner>/<repo>/refs/rss.xml")
@@ 540,4 542,4 @@ def ref(owner, repo, ref):
.filter(Artifact.commit == tag.target.hex)).all()
return render_template("ref.html", view="refs",
owner=owner, repo=repo, git_repo=git_repo, tag=tag,
- artifacts=artifacts)
+ artifacts=artifacts, default_branch=git_repo.default_branch())
M gitsrht/blueprints/stats.py => gitsrht/blueprints/stats.py +2 -1
@@ 38,4 38,5 @@ def contributors(owner, repo):
chart_data = get_contrib_chart_data(contributions)
return render_template("contributors.html", view="contributors",
- owner=owner, repo=repo, chart_data=chart_data)
+ owner=owner, repo=repo, chart_data=chart_data,
+ default_branch=default_branch)
M gitsrht/templates/refs.html => gitsrht/templates/refs.html +1 -1
@@ 95,7 95,7 @@
owner=repo.owner.canonical_name,
repo=repo.name, ref=name)}}"
class="btn btn-block {{ "btn-primary"
- if branch.name == git_repo.default_branch().name
+ if branch.name == default_branch.name
else "btn-default" }}"
>browse {{icon("caret-right")}}</a>
</div>
M gitsrht/templates/repo.html => gitsrht/templates/repo.html +8 -4
@@ 6,10 6,14 @@
{# Man, this is lame #}
<meta name="go-import"
content="{{domain}}/{{owner.canonical_name}}/{{repo.name}} git {{(repo | clone_urls)[0]}}">
-<meta name="go-source"
- content="{{domain}}/{{owner.canonical_name}}/{{repo.name}} {{(repo | clone_urls)[0]}}
- {{(repo | clone_urls)[0]}}/tree/master{/dir}
- {{(repo | clone_urls)[0]}}/tree/master{/dir}/{file}#L{line}">
+{% if default_branch %}
+ <meta name="go-source"
+ content="{{domain}}/{{owner.canonical_name}}/{{repo.name}} {{(repo | clone_urls)[0]}}
+ {{(repo | clone_urls)[0]}}/tree/
+ {{- default_branch.name[("refs/heads/"|length):]}}{/dir}
+ {{(repo | clone_urls)[0]}}/tree/
+ {{- default_branch.name[("refs/heads/"|length):]}}{/dir}/{file}#L{line}">
+{% endif %}
{% endblock %}
{% block body %}
<div class="header-tabbed">