Show branches in repo viewer

diff --git a/README.md b/README.md
index f4250a47a455281f9533cdafbdc824705b9248df..d0a0c2054cdd8ecd78f4a27daed187aeb9a43684 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language.
 
 Since we choose to use pure Go implmentation of Git manipulation, Gogs certainly supports **ALL platforms**  that Go supports, including Linux, Max OS X, and Windows with **ZERO** dependency.
 
-##### Current version: 0.0.8 Alpha
+##### Current version: 0.0.9 Alpha
 
 ## Purpose
 

diff --git a/bee.json b/bee.json
index de211f7277ee257caa065ebab84fd6e871171ab7..19efcbc205f22dec7a9398edbbea95367c38aefe 100644 (file)
--- a/bee.json
+++ b/bee.json
@@ -12,7 +12,8 @@
                "models": "",
                "others": [
                        "modules",
-                       "$GOPATH/src/github.com/gogits/binding"
+                       "$GOPATH/src/github.com/gogits/binding",
+                       "$GOPATH/src/github.com/gogits/git"
                ]
        },
        "cmd_args": [

diff --git a/models/repo2.go b/models/repo2.go
index e3fdc2784b802c20811beb9c3a7b86de6db859df..a8dbc44db9712e08602e7f3d6dcf1bedaf9db997 100644 (file)
--- a/models/repo2.go
+++ b/models/repo2.go
@@ -8,7 +8,7 @@ import (
        "path"
        "time"
 
-       git "github.com/gogits/git"
+       "github.com/gogits/git"
 )
 
 type RepoFile struct {
@@ -19,10 +19,26 @@ type RepoFile struct {
        Size    int64
 }
 
-func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) {
-       f := RepoPath(userName, reposName)
+func GetBranches(userName, reposName string) ([]string, error) {
+       repo, err := git.OpenRepository(RepoPath(userName, reposName))
+       if err != nil {
+               return nil, err
+       }
+
+       refs, err := repo.AllReferences()
+       if err != nil {
+               return nil, err
+       }
+
+       brs := make([]string, len(refs))
+       for i, ref := range refs {
+               brs[i] = ref.Name
+       }
+       return brs, nil
+}
 
-       repo, err := git.OpenRepository(f)
+func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) {
+       repo, err := git.OpenRepository(RepoPath(userName, reposName))
        if err != nil {
                return nil, err
        }

diff --git a/routers/repo/single.go b/routers/repo/single.go
index 6bf03ca2b8a8ed714cbba435a6d4e0ab4210099f..fd4d5290310253f08bfa441ab68dfd81797c7a39 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -33,6 +33,13 @@ func Single(ctx *middleware.Context, params martini.Params) {
        ctx.Data["Reponame"] = params["reponame"]
        ctx.Data["Branchname"] = params["branchname"]
 
+       brs, err := models.GetBranches(params["username"], params["reponame"])
+       if err != nil {
+               ctx.Handle(200, "repo.Single", err)
+               return
+       }
+       ctx.Data["Branches"] = brs
+
        var treenames []string
        Paths := make([]string, 0)
 

diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl
index b5207d08202d88a6d1508ec505c5ffaf45a4d992..e1fb05bd03d5e663f64567339faca9a7b5b9db40 100644 (file)
--- a/templates/repo/single.tmpl
+++ b/templates/repo/single.tmpl
@@ -5,21 +5,23 @@
 <div id="gogs-body" class="container">
     <div id="gogs-source">
         <div class="source-toolbar">
+            {{ $username := .Username}}
+            {{ $reponame := .Reponame}}
+            {{ $branchname := .Branchname}}
+            {{ $treenames := .Treenames}}
+            {{ $repoLink := .RepositoryLink}}
+            {{ $n := len $treenames}}
             <button class="btn btn-default pull-right"><i class="fa fa-plus-square"></i>Add File</button>
             <div class="dropdown branch-switch">
-                <a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>master&nbsp;&nbsp;
+                <a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>{{$branchname}}&nbsp;&nbsp;
                     <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                    <li><a class="current" href="/{{.RepositoryLink}}/tree/master">master</a></li>
-                    <li><a href="/{{.RepositoryLink}}/tree/develop">develop</a></li>
+                    {{range .Branches}}
+                    <li><a {{if eq . $branchname}}class="current" {{end}}href="/{{$repoLink}}/tree/{{.}}">{{.}}</a></li>
+                    {{end}}
                 </ul>
             </div>
             {{$paths := .Paths}}
-                {{ $username := .Username}}
-            {{ $reponame := .Reponame}}
-            {{ $branchname := .Branchname}}
-            {{ $treenames := .Treenames}}
-            {{ $n := len $treenames}}
             {{ $l := Subtract $n 1}}
             <ol class="breadcrumb">
                 <li class="root dir"><a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}">{{.Repository.Name}}</a></li>