diff options
| author | Unknwon <u@gogs.io> | 2015-12-09 20:46:05 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-12-09 20:46:05 -0500 |
| commit | 9a2e43bff28ac92f180109fe900a6997614ea5a8 (patch) | |
| tree | 564dbb6fb30c153e43b0e18499d80e7d93dd0bee /routers/repo/view.go | |
| parent | bd5dc626e82e18d3e619d918e579dc130edcd1fa (diff) | |
| download | gitea-9a2e43bff28ac92f180109fe900a6997614ea5a8.tar.gz gitea-9a2e43bff28ac92f180109fe900a6997614ea5a8.zip | |
move out git module and #1573 send push hook
Diffstat (limited to 'routers/repo/view.go')
| -rw-r--r-- | routers/repo/view.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/routers/repo/view.go b/routers/repo/view.go index 361d77a85a..f019256d3e 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -13,9 +13,10 @@ import ( "github.com/Unknwon/paginater" + "github.com/gogits/git-shell" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/template" @@ -59,7 +60,7 @@ func Home(ctx *middleware.Context) { } entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename) - if err != nil && err != git.ErrNotExist { + if err != nil && git.IsErrNotExist(err) { ctx.Handle(404, "GetTreeEntryByPath", err) return } @@ -126,7 +127,7 @@ func Home(ctx *middleware.Context) { return } - entries, err := tree.ListEntries(treename) + entries, err := tree.ListEntries() if err != nil { ctx.Handle(500, "ListEntries", err) return @@ -135,10 +136,10 @@ func Home(ctx *middleware.Context) { files := make([][]interface{}, 0, len(entries)) for _, te := range entries { - if te.Type != git.COMMIT { - c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name())) + if te.Type != git.OBJECT_COMMIT { + c, err := ctx.Repo.Commit.GetCommitByPath(filepath.Join(treePath, te.Name())) if err != nil { - ctx.Handle(500, "GetCommitOfRelPath", err) + ctx.Handle(500, "GetCommitByPath", err) return } files = append(files, []interface{}{te, c}) @@ -153,9 +154,9 @@ func Home(ctx *middleware.Context) { smUrl = sm.Url } - c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name())) + c, err := ctx.Repo.Commit.GetCommitByPath(filepath.Join(treePath, te.Name())) if err != nil { - ctx.Handle(500, "GetCommitOfRelPath", err) + ctx.Handle(500, "GetCommitByPath", err) return } files = append(files, []interface{}{te, git.NewSubModuleFile(c, smUrl, te.ID.String())}) @@ -209,9 +210,9 @@ func Home(ctx *middleware.Context) { lastCommit := ctx.Repo.Commit if len(treePath) > 0 { - c, err := ctx.Repo.Commit.GetCommitOfRelPath(treePath) + c, err := ctx.Repo.Commit.GetCommitByPath(treePath) if err != nil { - ctx.Handle(500, "GetCommitOfRelPath", err) + ctx.Handle(500, "GetCommitByPath", err) return } lastCommit = c |