summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-24 18:25:15 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-24 18:25:15 +0800
commit137538e54b3aade46cf2ef947707f4e32ba8a382 (patch)
treea566f2140eee58e06b4dc41712fc188adcdec4fc
parentb9b82cfe477bcbfd3541adfc969ff20210d56549 (diff)
downloadgitea-137538e54b3aade46cf2ef947707f4e32ba8a382.tar.gz
gitea-137538e54b3aade46cf2ef947707f4e32ba8a382.zip
refactor repo.go
-rw-r--r--routers/repo/branch.go38
-rw-r--r--routers/repo/commit.go35
-rw-r--r--routers/repo/pull.go20
-rw-r--r--routers/repo/repo.go63
4 files changed, 94 insertions, 62 deletions
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
new file mode 100644
index 0000000000..8c953f2ede
--- /dev/null
+++ b/routers/repo/branch.go
@@ -0,0 +1,38 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+ "github.com/codegangsta/martini"
+ "github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/middleware"
+)
+
+func Branches(ctx *middleware.Context, params martini.Params) {
+ if !ctx.Repo.IsValid {
+ return
+ }
+
+ brs, err := models.GetBranches(params["username"], params["reponame"])
+ if err != nil {
+ ctx.Handle(200, "repo.Branches", err)
+ return
+ } else if len(brs) == 0 {
+ ctx.Handle(404, "repo.Branches", nil)
+ return
+ }
+
+ ctx.Data["Username"] = params["username"]
+ ctx.Data["Reponame"] = params["reponame"]
+
+ if len(params["branchname"]) == 0 {
+ params["branchname"] = "master"
+ }
+ ctx.Data["Branchname"] = params["branchname"]
+ ctx.Data["Branches"] = brs
+ ctx.Data["IsRepoToolbarBranches"] = true
+
+ ctx.HTML(200, "repo/branches")
+}
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
new file mode 100644
index 0000000000..60ee2177f3
--- /dev/null
+++ b/routers/repo/commit.go
@@ -0,0 +1,35 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+ "github.com/codegangsta/martini"
+ "github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/middleware"
+)
+
+func Commits(ctx *middleware.Context, params martini.Params) {
+ brs, err := models.GetBranches(params["username"], params["reponame"])
+ if err != nil {
+ ctx.Handle(200, "repo.Commits", err)
+ return
+ } else if len(brs) == 0 {
+ ctx.Handle(404, "repo.Commits", nil)
+ return
+ }
+
+ ctx.Data["IsRepoToolbarCommits"] = true
+ commits, err := models.GetCommits(params["username"],
+ params["reponame"], params["branchname"])
+ if err != nil {
+ ctx.Handle(404, "repo.Commits", nil)
+ return
+ }
+ ctx.Data["Username"] = params["username"]
+ ctx.Data["Reponame"] = params["reponame"]
+ ctx.Data["CommitCount"] = commits.Len()
+ ctx.Data["Commits"] = commits
+ ctx.HTML(200, "repo/commits")
+}
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
new file mode 100644
index 0000000000..d4a12a4a83
--- /dev/null
+++ b/routers/repo/pull.go
@@ -0,0 +1,20 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+ "github.com/codegangsta/martini"
+ "github.com/gogits/gogs/modules/middleware"
+)
+
+func Pulls(ctx *middleware.Context, params martini.Params) {
+ ctx.Data["IsRepoToolbarPulls"] = true
+ if len(params["branchname"]) == 0 {
+ params["branchname"] = "master"
+ }
+
+ ctx.Data["Branchname"] = params["branchname"]
+ ctx.HTML(200, "repo/pulls")
+}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index b05ce4a717..a055b416c2 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -52,33 +52,6 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
ctx.Handle(200, "repo.Create", err)
}
-func Branches(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- return
- }
-
- brs, err := models.GetBranches(params["username"], params["reponame"])
- if err != nil {
- ctx.Handle(200, "repo.Branches", err)
- return
- } else if len(brs) == 0 {
- ctx.Handle(404, "repo.Branches", nil)
- return
- }
-
- ctx.Data["Username"] = params["username"]
- ctx.Data["Reponame"] = params["reponame"]
-
- if len(params["branchname"]) == 0 {
- params["branchname"] = "master"
- }
- ctx.Data["Branchname"] = params["branchname"]
- ctx.Data["Branches"] = brs
- ctx.Data["IsRepoToolbarBranches"] = true
-
- ctx.HTML(200, "repo/branches")
-}
-
func Single(ctx *middleware.Context, params martini.Params) {
if !ctx.Repo.IsValid {
return
@@ -279,7 +252,7 @@ func Setting(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, "repo/setting")
}
-func SettingPost(ctx *middleware.Context, params martini.Params) {
+func SettingPost(ctx *middleware.Context) {
if !ctx.Repo.IsOwner {
ctx.Error(404)
return
@@ -313,40 +286,6 @@ func SettingPost(ctx *middleware.Context, params martini.Params) {
}
}
-func Commits(ctx *middleware.Context, params martini.Params) {
- brs, err := models.GetBranches(params["username"], params["reponame"])
- if err != nil {
- ctx.Handle(200, "repo.Commits", err)
- return
- } else if len(brs) == 0 {
- ctx.Handle(404, "repo.Commits", nil)
- return
- }
-
- ctx.Data["IsRepoToolbarCommits"] = true
- commits, err := models.GetCommits(params["username"],
- params["reponame"], params["branchname"])
- if err != nil {
- ctx.Handle(404, "repo.Commits", nil)
- return
- }
- ctx.Data["Username"] = params["username"]
- ctx.Data["Reponame"] = params["reponame"]
- ctx.Data["CommitCount"] = commits.Len()
- ctx.Data["Commits"] = commits
- ctx.HTML(200, "repo/commits")
-}
-
-func Pulls(ctx *middleware.Context, params martini.Params) {
- ctx.Data["IsRepoToolbarPulls"] = true
- if len(params["branchname"]) == 0 {
- params["branchname"] = "master"
- }
-
- ctx.Data["Branchname"] = params["branchname"]
- ctx.HTML(200, "repo/pulls")
-}
-
func Action(ctx *middleware.Context, params martini.Params) {
var err error
switch params["action"] {