33 changed files with 284 additions and 2875 deletions
--- a/models/release.go
+++ b/models/release.go
@ -96,7 +96,6 @@ func (r *Release) APIFormat() *api.Release {
 		TagName:      r.TagName,
 		Target:       r.Target,
 		Title:        r.Title,
-		Sha1:         r.Sha1,
 		Note:         r.Note,
 		URL:          r.APIURL(),
 		HTMLURL:      r.HTMLURL(),
--- a/models/repo.go
+++ b/models/repo.go
@ -994,9 +994,7 @@ func (repo *Repository) cloneLink(isWiki bool) *CloneLink {
 func (repo *Repository) CloneLink() (cl *CloneLink) {
 	return repo.cloneLink(false)
 }
-func (repo *Repository) CloneWikiLink() (cl *CloneLink) {
-	return repo.cloneLink(true)
-}
+
 // CheckCreateRepository check if could created a repository
 func CheckCreateRepository(doer, u *User, name string) error {
 	if !doer.CanCreateRepo() {
--- a/models/webhook.go
+++ b/models/webhook.go
@ -55,13 +55,6 @@ func IsValidHookContentType(name string) bool {
 	return ok
 }

-func IsValidHookHttpMethod(name string) bool {
-	if name == "POST" || name == "GET" {
-		return true
-	}
-	return false
-}
-
 // HookEvents is a set of web hook events
 type HookEvents struct {
 	Create               bool `json:"create"`
@ -122,7 +115,6 @@ type Webhook struct {
 	HookTaskType    HookTaskType
 	Meta            string     `xorm:"TEXT"` // store hook-specific attributes
 	LastStatus      HookStatus // Last delivery status
-	BranchFilter    string     `xorm:"TEXT"`

 	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
 	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
@ -756,18 +748,6 @@ func (t *HookTask) simpleMarshalJSON(v interface{}) string {
 	return string(p)
 }

-func GetHookTasksByRepoIDAndHookID(repoID int64, hookID int64, listOptions ListOptions) ([]*HookTask, error) {
-	if listOptions.Page == 0 {
-		hookTasks := make([]*HookTask, 0, 5)
-		return hookTasks, x.Find(&hookTasks, &HookTask{RepoID: repoID, HookID: hookID})
-	}
-
-	sess := listOptions.getPaginatedSession()
-	hookTasks := make([]*HookTask, 0, listOptions.PageSize)
-
-	return hookTasks, sess.Find(&hookTasks, &HookTask{RepoID: repoID, HookID: hookID})
-}
-
 // HookTasks returns a list of hook tasks by given conditions.
 func HookTasks(hookID int64, page int) ([]*HookTask, error) {
 	tasks := make([]*HookTask, 0, setting.Webhook.PagingNum)
--- a/modules/context/api.go
+++ b/modules/context/api.go
@ -234,7 +234,7 @@ func ReferencesGitRepo(allowEmpty bool) macaron.Handler {
 // NotFound handles 404s for APIContext
 // String will replace message, errors will be added to a slice
 func (ctx *APIContext) NotFound(objs ...interface{}) {
-	var message = "Not Found (ownerName,repo etc...)"
+	var message = "Not Found"
 	var errors []string
 	for _, obj := range objs {
 		// Ignore nil
@ -255,94 +255,3 @@ func (ctx *APIContext) NotFound(objs ...interface{}) {
 		"errors":            errors,
 	})
 }
-
-func (ctx *APIContext) FileNameError(objs ...interface{}){
-	var message = "FileName too long"
-	var errors []string
-
-	for _, obj := range objs {
-		// Ignore nil
-		if obj == nil {
-			continue
-		}
-
-		if err, ok := obj.(error); ok {
-			errors = append(errors, err.Error())
-		} else {
-			message = obj.(string)
-		}
-	}
-	ctx.JSON(500, map[string]interface{}{
-		"message":           message,
-		"documentation_url": setting.API.SwaggerURL,
-		"errors":            errors,
-	})
-}
-func (ctx *APIContext) SameFileNameError(objs ...interface{}){
-	var message = "Same name exists"
-	var errors []string
-
-	for _, obj := range objs {
-		// Ignore nil
-		if obj == nil {
-			continue
-		}
-
-		if err, ok := obj.(error); ok {
-			errors = append(errors, err.Error())
-		} else {
-			message = obj.(string)
-		}
-	}
-	ctx.JSON(500, map[string]interface{}{
-		"message":           message,
-		"documentation_url": setting.API.SwaggerURL,
-		"errors":            errors,
-	})
-}
-
-func (ctx *APIContext) FileExistError(objs ...interface{}){
-	var message = "file does not exist"
-	var errors []string
-
-	for _, obj := range objs {
-		// Ignore nil
-		if obj == nil {
-			continue
-		}
-
-		if err, ok := obj.(error); ok {
-			errors = append(errors, err.Error())
-		} else {
-			message = obj.(string)
-		}
-	}
-	ctx.JSON(500, map[string]interface{}{
-		"message":           message,
-		"documentation_url": setting.API.SwaggerURL,
-		"errors":            errors,
-	})
-}
-func (ctx *APIContext) CheckHasWiki(objs ...interface{}){
-	var message = "No wikies"
-	var errors []string
-
-	for _, obj := range objs {
-		// Ignore nil
-		if obj == nil {
-			continue
-		}
-
-		if err, ok := obj.(error); ok {
-			errors = append(errors, err.Error())
-		} else {
-			message = obj.(string)
-		}
-	}
-	ctx.JSON(500, map[string]interface{}{
-		"message":           message,
-		"documentation_url": setting.API.SwaggerURL,
-		"errors":            errors,
-	})
-}
-
--- a/modules/context/context.go
+++ b/modules/context/context.go
@ -46,7 +46,6 @@ type Context struct {

 	Repo *Repository
 	Org  *Organization
-
 }

 // IsUserSiteAdmin returns true if current user is a site admin
--- a/modules/convert/convert.go
+++ b/modules/convert/convert.go
@ -5,7 +5,6 @@
 package convert

 import (
-	"encoding/json"
 	"fmt"
 	"time"

@ -30,19 +29,8 @@ func ToEmail(email *models.EmailAddress) *api.Email {
 	}
 }

-type BranchKind int
-
-const (
-	None BranchKind = iota
-	DefaultBranch
-	ProtectedBranch
-	OtherBranch
-)
-
 // ToBranch convert a git.Commit and git.Branch to an api.Branch
 func ToBranch(repo *models.Repository, b *git.Branch, c *git.Commit, bp *models.ProtectedBranch, user *models.User, isRepoAdmin bool) (*api.Branch, error) {
-
-	var branchKind BranchKind
 	if bp == nil {
 		var hasPerm bool
 		var err error
@ -52,15 +40,9 @@ func ToBranch(repo *models.Repository, b *git.Branch, c *git.Commit, bp *models.
 				return nil, err
 			}
 		}
-		if b.Name == repo.DefaultBranch {
-			branchKind = DefaultBranch
-		} else {
-			branchKind = OtherBranch
-		}

 		return &api.Branch{
 			Name:                b.Name,
-			CommitID:            c.ID.String(), //add configure
 			Commit:              ToCommit(repo, c),
 			Protected:           false,
 			RequiredApprovals:   0,
@ -68,28 +50,16 @@ func ToBranch(repo *models.Repository, b *git.Branch, c *git.Commit, bp *models.
 			StatusCheckContexts: []string{},
 			UserCanPush:         hasPerm,
 			UserCanMerge:        hasPerm,
-			CommitTime:          c.Author.When.Format(time.RFC3339),
-			DefaultBranch:       repo.DefaultBranch,
-			BranchKind:          int(branchKind),
 		}, nil
 	}
-	if b.Name == repo.DefaultBranch {
-		branchKind = DefaultBranch
-	} else {
-		branchKind = ProtectedBranch
-	}

 	branch := &api.Branch{
 		Name:                b.Name,
-		CommitID:            c.ID.String(), // add configure
 		Commit:              ToCommit(repo, c),
 		Protected:           true,
 		RequiredApprovals:   bp.RequiredApprovals,
 		EnableStatusCheck:   bp.EnableStatusCheck,
 		StatusCheckContexts: bp.StatusCheckContexts,
-		CommitTime:          c.Author.When.Format(time.RFC3339),
-		DefaultBranch:       repo.DefaultBranch,
-		BranchKind:          int(branchKind),
 	}

 	if isRepoAdmin {
@ -158,42 +128,16 @@ func ToBranchProtection(bp *models.ProtectedBranch) *api.BranchProtection {
 }

 // ToTag convert a git.Tag to an api.Tag
-// func ToTag(repo *models.Repository, t *git.Tag) *api.Tag {
-// 	return &api.Tag{
-// 		Name:       t.Name,
-// 		ID:         t.ID.String(),
-// 		Commit:     ToCommitMeta(repo, t),
-// 		ZipballURL: util.URLJoin(repo.HTMLURL(), "archive", t.Name+".zip"),
-// 		TarballURL: util.URLJoin(repo.HTMLURL(), "archive", t.Name+".tar.gz"),
-// 	}
-// }
-
 func ToTag(repo *models.Repository, t *git.Tag) *api.Tag {
 	return &api.Tag{
 		Name:       t.Name,
 		ID:         t.ID.String(),
-		Commit:     ToTagCommit(repo, t),
-		Tagger:     ToCommitUser(t.Tagger),
-		Message:    t.Message,
+		Commit:     ToCommitMeta(repo, t),
 		ZipballURL: util.URLJoin(repo.HTMLURL(), "archive", t.Name+".zip"),
 		TarballURL: util.URLJoin(repo.HTMLURL(), "archive", t.Name+".tar.gz"),
 	}
 }

-func ToTagCommit(repo *models.Repository, t *git.Tag) *api.TagCommit {
-	commit, err := t.Commit()
-	if err != nil {
-		log.Error("Commit", err)
-		return &api.TagCommit{}
-	}
-	return &api.TagCommit{
-		CommitMeta: ToCommitMeta(repo, t),
-		Commiter:   ToCommitUser(commit.Committer),
-		Author:     ToCommitUser(commit.Author),
-		Message:    commit.CommitMessage,
-	}
-}
-
 // ToCommit convert a git.Commit to api.PayloadCommit
 func ToCommit(repo *models.Repository, c *git.Commit) *api.PayloadCommit {
 	authorUsername := ""
@ -311,7 +255,6 @@ func ToHook(repoLink string, w *models.Webhook) *api.Hook {
 	config := map[string]string{
 		"url":          w.URL,
 		"content_type": w.ContentType.Name(),
-		"http_method":  w.HTTPMethod,
 	}
 	if w.HookTaskType == models.SLACK {
 		s := webhook.GetSlackHook(w)
@ -322,45 +265,14 @@ func ToHook(repoLink string, w *models.Webhook) *api.Hook {
 	}

 	return &api.Hook{
-		ID:           w.ID,
-		Type:         w.HookTaskType.Name(),
-		URL:          fmt.Sprintf("%s/settings/hooks/%d", repoLink, w.ID),
-		BranchFilter: w.HookEvent.BranchFilter,
-		Active:       w.IsActive,
-		Config:       config,
-		Events:       w.EventsArray(),
-		Updated:      w.UpdatedUnix.AsTime(),
-		Created:      w.CreatedUnix.AsTime(),
-	}
-}
-
-func ToHookTask(t *models.HookTask) *api.HookTask {
-	config := map[string]string{
-		"url":          t.URL,
-		"content_type": t.ContentType.Name(),
-		"http_method":  t.HTTPMethod,
-	}
-
-	payloadContent := make(map[string]interface{})
-	requestContent := make(map[string]interface{})
-	responseContent := make(map[string]interface{})
-	_ = json.Unmarshal([]byte(t.PayloadContent), &payloadContent)
-	_ = json.Unmarshal([]byte(t.RequestContent), &requestContent)
-	_ = json.Unmarshal([]byte(t.ResponseContent), &responseContent)
-
-	return &api.HookTask{
-		ID:              t.ID,
-		UUID:            t.UUID,
-		Type:            t.Type.Name(),
-		Config:          config,
-		PayloadContent:  payloadContent,
-		EventType:       string(t.EventType),
-		IsSSL:           t.IsSSL,
-		IsDelivered:     t.IsDelivered,
-		Delivered:       t.Delivered,
-		IsSucceed:       t.IsSucceed,
-		RequestContent:  requestContent,
-		ResponseContent: responseContent,
+		ID:      w.ID,
+		Type:    w.HookTaskType.Name(),
+		URL:     fmt.Sprintf("%s/settings/hooks/%d", repoLink, w.ID),
+		Active:  w.IsActive,
+		Config:  config,
+		Events:  w.EventsArray(),
+		Updated: w.UpdatedUnix.AsTime(),
+		Created: w.CreatedUnix.AsTime(),
 	}
 }

@ -479,16 +391,6 @@ func ToCommitMeta(repo *models.Repository, tag *git.Tag) *api.CommitMeta {
 	}
 }

-func ToCommitUserFolk(user *models.User) *api.CommitUser {
-	return &api.CommitUser{
-		Identity: api.Identity{
-			Name:  user.Name,
-			Email: user.Email,
-		},
-		Date: user.CreatedUnix.AsTime().String(),
-	}
-}
-
 // ToTopicResponse convert from models.Topic to api.TopicResponse
 func ToTopicResponse(topic *models.Topic) *api.TopicResponse {
 	return &api.TopicResponse{
--- a/modules/convert/utils.go
+++ b/modules/convert/utils.go
@ -5,10 +5,7 @@
 package convert

 import (
-	"strings"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/structs"
-
 )

 // ToCorrectPageSize makes sure page size is in allowed range.
@ -20,36 +17,3 @@ func ToCorrectPageSize(size int) int {
 	}
 	return size
 }
-
-
-
-// ToGitServiceType return GitServiceType based on string
-func ToGitServiceType(value string) structs.GitServiceType {
-	switch strings.ToLower(value) {
-	case "github":
-		return structs.GithubService
-	case "gitea":
-		return structs.GiteaService
-	case "gitlab":
-		return structs.GitlabService
-	case "gogs":
-		return structs.GogsService
-	default:
-		return structs.PlainGitService
-	}
-}
-
-
-// 
-func ToBranchType(index int) structs.BranchKind{
-	switch(index){
-	case 1:
-		return structs.DefaultBranch
-	case 2:
-		return structs.ProtectedBranch
-	case 3:
-		return structs.OtherBranch
-	default:
-		return structs.None
-	}
-}
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@ -293,11 +293,6 @@ func CommitsCount(repoPath, revision string) (int64, error) {
 	return commitsCount(repoPath, []string{revision}, []string{})
 }

-// CommitsCountByFile returns number of total commits of unitl given revision and file
-func CommitsCountByFile(repoPath, revision, file string) (int64, error) {
-	return commitsCount(repoPath, []string{revision}, []string{file})
-}
-
 // CommitsCount returns number of total commits of until current revision.
 func (c *Commit) CommitsCount() (int64, error) {
 	return CommitsCount(c.repo.Path, c.ID.String())
@ -308,11 +303,6 @@ func (c *Commit) CommitsByRange(page, pageSize int) (*list.List, error) {
 	return c.repo.commitsByRange(c.ID, page, pageSize)
 }

-// CommitsByFileAndRange returns the specific page page commits before current revision and file, every page's number default by CommitsRangeSize
-func (c *Commit) CommitsByFileAndRange(file string, page, pageSize int) (*list.List, error) {
-	return c.repo.CommitsByFileAndRange(c.ID.String(), file, page, pageSize)
-}
-
 // CommitsBefore returns all the commits before current revision
 func (c *Commit) CommitsBefore() (*list.List, error) {
 	return c.repo.getCommitsBefore(c.ID)
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@ -198,6 +198,7 @@ func (repo *Repository) GetCommitByPath(relpath string) (*Commit, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	commits, err := repo.parsePrettyFormatLogToList(stdout)
 	if err != nil {
 		return nil, err
@ -205,19 +206,6 @@ func (repo *Repository) GetCommitByPath(relpath string) (*Commit, error) {
 	return commits.Front().Value.(*Commit), nil
 }

-// GetFirstAndLastCommitByPath returns the first commit and the last commit  of relative path.
-func (repo *Repository) GetFirstAndLastCommitByPath(revision, relpath string) (*Commit, *Commit, error) {
-	stdout, err := NewCommand("log", revision, prettyLogFormat, "--", relpath).RunInDirBytes(repo.Path)
-	if err != nil {
-		return nil, nil, err
-	}
-	commits, err := repo.parsePrettyFormatLogToList(stdout)
-	if err != nil {
-		return nil, nil, err
-	}
-	return commits.Front().Value.(*Commit), commits.Back().Value.(*Commit), nil
-}
-
 // CommitsRangeSize the default commits range size
 var CommitsRangeSize = 50

@ -335,8 +323,8 @@ func (repo *Repository) FileCommitsCount(revision, file string) (int64, error) {
 }

 // CommitsByFileAndRange return the commits according revison file and the page
-func (repo *Repository) CommitsByFileAndRange(revision, file string, page, pageSize int) (*list.List, error) {
-	stdout, err := NewCommand("log", revision, "--follow", "--skip="+strconv.Itoa((page-1)*pageSize),
+func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) (*list.List, error) {
+	stdout, err := NewCommand("log", revision, "--follow", "--skip="+strconv.Itoa((page-1)*50),
 		"--max-count="+strconv.Itoa(CommitsRangeSize), prettyLogFormat, "--", file).RunInDirBytes(repo.Path)
 	if err != nil {
 		return nil, err
@ -345,8 +333,8 @@ func (repo *Repository) CommitsByFileAndRange(revision, file string, page, pageS
 }

 // CommitsByFileAndRangeNoFollow return the commits according revison file and the page
-func (repo *Repository) CommitsByFileAndRangeNoFollow(revision, file string, page, pageSize int) (*list.List, error) {
-	stdout, err := NewCommand("log", revision, "--skip="+strconv.Itoa((page-1)*pageSize),
+func (repo *Repository) CommitsByFileAndRangeNoFollow(revision, file string, page int) (*list.List, error) {
+	stdout, err := NewCommand("log", revision, "--skip="+strconv.Itoa((page-1)*50),
 		"--max-count="+strconv.Itoa(CommitsRangeSize), prettyLogFormat, "--", file).RunInDirBytes(repo.Path)
 	if err != nil {
 		return nil, err
--- a/modules/git/repo_tag.go
+++ b/modules/git/repo_tag.go
@ -186,16 +186,6 @@ func (repo *Repository) GetTag(name string) (*Tag, error) {
 	return tag, nil
 }

-func (repo *Repository) GetTagCount() (int64, error) {
-	stdout, err := NewCommand("tag").RunInDir(repo.Path)
-	if err != nil {
-		return 0, err
-	}
-
-	tagNames := strings.Split(strings.TrimRight(stdout, "\n"), "\n")
-	return int64(len(tagNames)), nil
-}
-
 // GetTagInfos returns all tag infos of the repository.
 func (repo *Repository) GetTagInfos(page, pageSize int) ([]*Tag, error) {
 	// TODO this a slow implementation, makes one git command per tag
--- a/modules/structs/hook.go
+++ b/modules/structs/hook.go
@ -19,13 +19,12 @@ var (

 // Hook a hook is a web hook when one repository changed
 type Hook struct {
-	ID           int64             `json:"id"`
-	Type         string            `json:"type"`
-	URL          string            `json:"-"`
-	Config       map[string]string `json:"config"`
-	Events       []string          `json:"events"`
-	Active       bool              `json:"active"`
-	BranchFilter string            `json:"branch_filter"`
+	ID     int64             `json:"id"`
+	Type   string            `json:"type"`
+	URL    string            `json:"-"`
+	Config map[string]string `json:"config"`
+	Events []string          `json:"events"`
+	Active bool              `json:"active"`
 	// swagger:strfmt date-time
 	Updated time.Time `json:"updated_at"`
 	// swagger:strfmt date-time
@ -35,21 +34,6 @@ type Hook struct {
 // HookList represents a list of API hook.
 type HookList []*Hook

-type HookTask struct {
-	ID              int64                  `json:"id"`
-	UUID            string                 `json:"uuid"`
-	Type            string                 `json:"type"`
-	Config          map[string]string      `json:"config"`
-	PayloadContent  map[string]interface{} `json:"payload_content"`
-	EventType       string                 `json:"event_type"`
-	IsSSL           bool                   `json:"is_ssl"`
-	IsDelivered     bool                   `json:"is_delivered"`
-	Delivered       int64                  `json:"delivered"`
-	IsSucceed       bool                   `json:"is_succeed"`
-	RequestContent  map[string]interface{} `json:"request_info"`
-	ResponseContent map[string]interface{} `json:"response_content"`
-}
-
 // CreateHookOptionConfig has all config options in it
 // required are "content_type" and "url" Required
 type CreateHookOptionConfig map[string]string
--- a/modules/structs/release.go
+++ b/modules/structs/release.go
@ -1,11 +1,3 @@
-/*
- * @Description: Do not edit
- * @Date: 2021-07-09 10:47:30
- * @LastEditors: viletyy
- * @Author: viletyy
- * @LastEditTime: 2021-09-27 16:46:33
- * @FilePath: /gitea-1120-rc1/modules/structs/release.go
- */
 // Copyright 2016 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
@ -22,7 +14,6 @@ type Release struct {
 	TagName      string `json:"tag_name"`
 	Target       string `json:"target_commitish"`
 	Title        string `json:"name"`
-	Sha1         string `json:"sha"`
 	Note         string `json:"body"`
 	URL          string `json:"url"`
 	HTMLURL      string `json:"html_url"`
--- a/modules/structs/repo_branch.go
+++ b/modules/structs/repo_branch.go
@ -5,14 +5,12 @@
 package structs

 import (
-	"strings"
 	"time"
 )

 // Branch represents a repository branch
 type Branch struct {
 	Name                          string         `json:"name"`
-	CommitID                      string         `json:"commit_id"` // add configure
 	Commit                        *PayloadCommit `json:"commit"`
 	Protected                     bool           `json:"protected"`
 	RequiredApprovals             int64          `json:"required_approvals"`
@ -21,56 +19,7 @@ type Branch struct {
 	UserCanPush                   bool           `json:"user_can_push"`
 	UserCanMerge                  bool           `json:"user_can_merge"`
 	EffectiveBranchProtectionName string         `json:"effective_branch_protection_name"`
-	CommitTime 					  string		 `json:"commit_time"`   // add configure
-	DefaultBranch				  string 		 `json:"default_branch"`
-	BranchKind					  int 			 `json:"branch_kind"`
 }
-type BranchKind int 
-const (
-	
-	None BranchKind = iota  
-	DefaultBranch 
-	ProtectedBranch
-	OtherBranch
-)
-func (bk BranchKind) Name() string{
-	return strings.ToLower(bk.Title())
-}
-func (bk BranchKind) Title() string {
-	switch bk {
-	case DefaultBranch:
-		return "default"
-	case ProtectedBranch:
-		return "protected"
-	case OtherBranch:
-		return "other"
-	}
-	return ""
-}
-
-type BranchesSlice struct {
-
-	BranchName   string  `json:"branch_name"`
-	// BranchKind   int     `json:"branch_kind"`
-	Branches  []Branch   `json:"branches"`
-}
-
-//  sort by branchkind
-type SortBranch []Branch
-func (s SortBranch) Len() int           { return len(s) }
-func (s SortBranch) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s SortBranch) Less(i, j int) bool { return s[i].BranchKind < s[j].BranchKind}
-
-// sort by CommiTime of the branch
-type SortBranchTime []Branch
-func (s SortBranchTime) Len() int           { return len(s) }
-func (s SortBranchTime) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s SortBranchTime) Less(i, j int) bool { return s[i].CommitTime > s[j].CommitTime}
-
-
-
-
-

 // BranchProtection represents a branch protection for a repository
 type BranchProtection struct {
--- a/modules/structs/repo_commit.go
+++ b/modules/structs/repo_commit.go
@ -1,11 +1,3 @@
-/*
- * @Description: Do not edit
- * @Date: 2021-09-07 17:24:32
- * @LastEditors: viletyy
- * @Author: viletyy
- * @LastEditTime: 2021-09-29 10:16:48
- * @FilePath: /gitea-1120-rc1/modules/structs/repo_commit.go
- */
 // Copyright 2018 The Gogs Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
@ -46,7 +38,6 @@ type RepoCommit struct {
 }

 // Commit contains information generated from a Git commit.
-type SortCommit []Commit
 type Commit struct {
 	*CommitMeta
 	HTMLURL    string        `json:"html_url"`
@ -54,19 +45,8 @@ type Commit struct {
 	Author     *User         `json:"author"`
 	Committer  *User         `json:"committer"`
 	Parents    []*CommitMeta `json:"parents"`
-	CommitDate string        `json:"commit_date"`
-	Branch     string        `json:"branch"`
 }

-type CommitsSlice struct {
-	CommitDate string `json:"commit_date"`
-	Commits    []Commit
-}
-
-func (s SortCommit) Len() int           { return len(s) }
-func (s SortCommit) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s SortCommit) Less(i, j int) bool { return s[i].CommitDate > s[j].CommitDate }
-
 // CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE
 type CommitDateOptions struct {
 	// swagger:strfmt date-time
--- a/modules/structs/repo_tag.go
+++ b/modules/structs/repo_tag.go
@ -1,11 +1,3 @@
-/*
- * @Description: Do not edit
- * @Date: 2021-09-23 17:10:03
- * @LastEditors: viletyy
- * @Author: viletyy
- * @LastEditTime: 2021-09-24 17:45:38
- * @FilePath: /gitea-1120-rc1/modules/structs/repo_tag.go
- */
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
@ -16,20 +8,11 @@ package structs
 type Tag struct {
 	Name       string      `json:"name"`
 	ID         string      `json:"id"`
-	Commit     *TagCommit  `json:"commit"`
-	Tagger     *CommitUser `json:"tagger"`
-	Message    string      `json:"message"`
+	Commit     *CommitMeta `json:"commit"`
 	ZipballURL string      `json:"zipball_url"`
 	TarballURL string      `json:"tarball_url"`
 }

-type TagCommit struct {
-	*CommitMeta
-	Commiter *CommitUser `json:"commiter"`
-	Author   *CommitUser `json:"author"`
-	Message  string      `json:"message"`
-}
-
 // AnnotatedTag represents an annotated tag
 type AnnotatedTag struct {
 	Tag          string                     `json:"tag"`
--- a/modules/structs/wiki.go
+++ b/modules/structs/wiki.go
@ -1,50 +0,0 @@
-/*
- * @Date: 2021-08-06 14:28:55
- * @LastEditors: viletyy
- * @LastEditTime: 2021-08-19 18:00:34
- * @FilePath: /gitea-1120-rc1/modules/structs/wiki.go
- */
-package structs
-
-type WikiesResponse struct {
-	WikiMeta
-	WikiCloneLink CloneLink `json:"wiki_clone_link"`
-}
-
-type WikiMeta struct {
-	Name        string     `json:"name"`
-	Commit      WikiCommit `json:"commit"`
-	FirstCommit WikiCommit `json:"-"`
-	//WikiCloneLink	CloneLink 	`json:"wiki_clone_link"`
-}
-
-type WikiCommit struct {
-	ID       string   `json:"id"`
-	Message  string   `json:"message"`
-	Author   WikiUser `json:"author"`
-	Commiter WikiUser `json:"-"`
-}
-
-type WikiUser struct {
-	Name  string `json:"name"`
-	Email string `json:"email"`
-	When  int64  `json:"when"`
-}
-
-type WikiResponse struct {
-	WikiMeta
-	CommitCounts  int64     `json:"commit_counts"`
-	MdContent     string    `json:"md_content"`
-	SimpleContent string    `json:"simple_content"`
-	WikiCloneLink CloneLink `json:"wiki_clone_link"`
-}
-
-type WikiOption struct {
-	Name          string `json:"name"`
-	Content       string `json:"content"`
-	CommitMessage string `json:"commit_message"`
-}
-type CloneLink struct {
-	SSH   string `json:"ssh"`
-	HTTPS string `json:"https"`
-}
--- a/modules/wikies/wiki.go
+++ b/modules/wikies/wiki.go
@ -1,308 +0,0 @@
-/*
- * @Date: 2021-08-06 09:53:43
- * @LastEditors: viletyy
- * @LastEditTime: 2021-08-19 17:58:21
- * @FilePath: /gitea-1120-rc1/modules/wikies/wiki.go
- */
-package wikies
-
-import (
-	"fmt"
-
-	"code.gitea.io/gitea/models"
-	repo_module "code.gitea.io/gitea/modules/repository"
-	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/modules/sync"
-	"code.gitea.io/gitea/modules/util"
-	"github.com/unknwon/com"
-
-	//"github.com/unknwon/com"
-	"io/ioutil"
-	"net/url"
-	"strings"
-
-	//"code.gitea.io/gitea/modules/wikies"
-	"code.gitea.io/gitea/modules/context"
-	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/log"
-	wiki_service "code.gitea.io/gitea/services/wiki"
-)
-
-var (
-	reservedWikiNames = []string{"_pages", "_new", "_edit", "raw"}
-	wikiWorkingPool   = sync.NewExclusivePool()
-)
-
-func nameAllowed(name string) error {
-	if util.IsStringInSlice(name, reservedWikiNames) {
-		return models.ErrWikiReservedName{
-			Title: name,
-		}
-	}
-	return nil
-}
-func InitWiki(repo *models.Repository) error {
-	if repo.HasWiki() {
-		return nil
-	}
-
-	if err := git.InitRepository(repo.WikiPath(), true); err != nil {
-		return fmt.Errorf("InitRepository: %v", err)
-	} else if err = repo_module.CreateDelegateHooks(repo.WikiPath()); err != nil {
-		return fmt.Errorf("createDelegateHooks: %v", err)
-	}
-	return nil
-}
-
-func FindWikiRepoCommit(ctx *context.APIContext) (*git.Repository, *git.Commit, error) {
-	wikiRepo, err := git.OpenRepository(ctx.Repo.Repository.WikiPath())
-	if err != nil {
-		ctx.ServerError("OpenRepository", err)
-		return nil, nil, err
-	}
-
-	commit, err := wikiRepo.GetBranchCommit("master")
-	if err != nil {
-		return wikiRepo, nil, err
-	}
-	return wikiRepo, commit, nil
-}
-
-func WikiContentsByName(ctx *context.APIContext, commit *git.Commit, wikiName string) ([]byte, *git.TreeEntry, string, bool) {
-	pageFilename := wiki_service.NameToFilename(wikiName)
-	entry, err := findEntryForFile(commit, pageFilename)
-	if err != nil && !git.IsErrNotExist(err) {
-		ctx.ServerError("findEntryForFile", err)
-		return nil, nil, "", false
-	} else if entry == nil {
-		return nil, nil, "", true
-	}
-	return wikiContentsByEntry(ctx, entry), entry, pageFilename, false
-}
-
-func findEntryForFile(commit *git.Commit, target string) (*git.TreeEntry, error) {
-	entry, err := commit.GetTreeEntryByPath(target)
-	if err != nil && !git.IsErrNotExist(err) {
-		return nil, err
-	}
-	if entry != nil {
-		return entry, nil
-	}
-
-	// Then the unescaped, shortest alternative
-	var unescapedTarget string
-	if unescapedTarget, err = url.QueryUnescape(target); err != nil {
-		return nil, err
-	}
-	return commit.GetTreeEntryByPath(unescapedTarget)
-}
-
-func wikiContentsByEntry(ctx *context.APIContext, entry *git.TreeEntry) []byte {
-	reader, err := entry.Blob().DataAsync()
-	if err != nil {
-		ctx.ServerError("Blob.Data", err)
-		return nil
-	}
-	defer reader.Close()
-	content, err := ioutil.ReadAll(reader)
-	if err != nil {
-		ctx.ServerError("ReadAll", err)
-		return nil
-	}
-	return content
-}
-
-func CreateWikiPage(doer *models.User, repo *models.Repository, wikiName, content, message string) error {
-	return updateWikiPage(doer, repo, "", wikiName, content, message, true)
-}
-
-func EditWikiPage(doer *models.User, repo *models.Repository, oldWikiName, newWikiName, content, message string) error {
-	return updateWikiPage(doer, repo, oldWikiName, newWikiName, content, message, false)
-}
-func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, newWikiName, content, message string, isNew bool) (err error) {
-	if err = nameAllowed(newWikiName); err != nil {
-		return err
-	}
-	wikiWorkingPool.CheckIn(com.ToStr(repo.ID))
-	defer wikiWorkingPool.CheckOut(com.ToStr(repo.ID))
-
-	if err = InitWiki(repo); err != nil {
-		return fmt.Errorf("InitWiki: %v", err)
-	}
-
-	hasMasterBranch := git.IsBranchExist(repo.WikiPath(), "master")
-
-	basePath, err := models.CreateTemporaryPath("update-wiki")
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err := models.RemoveTemporaryPath(basePath); err != nil {
-			log.Error("Merge: RemoveTemporaryPath: %s", err)
-		}
-	}()
-
-	cloneOpts := git.CloneRepoOptions{
-		Bare:   true,
-		Shared: true,
-	}
-
-	if hasMasterBranch {
-		cloneOpts.Branch = "master"
-	}
-
-	if err := git.Clone(repo.WikiPath(), basePath, cloneOpts); err != nil {
-		log.Error("Failed to clone repository: %s (%v)", repo.FullName(), err)
-		return fmt.Errorf("Failed to clone repository: %s (%v)", repo.FullName(), err)
-	}
-
-	gitRepo, err := git.OpenRepository(basePath)
-	if err != nil {
-		log.Error("Unable to open temporary repository: %s (%v)", basePath, err)
-		return fmt.Errorf("Failed to open new temporary repository in: %s %v", basePath, err)
-	}
-	defer gitRepo.Close()
-
-	if hasMasterBranch {
-		if err := gitRepo.ReadTreeToIndex("HEAD"); err != nil {
-			log.Error("Unable to read HEAD tree to index in: %s %v", basePath, err)
-			return fmt.Errorf("Unable to read HEAD tree to index in: %s %v", basePath, err)
-		}
-	}
-
-	newWikiPath := wiki_service.NameToFilename(newWikiName)
-	if isNew {
-		filesInIndex, err := gitRepo.LsFiles(newWikiPath)
-		if err != nil {
-			log.Error("%v", err)
-			return err
-		}
-		if util.IsStringInSlice(newWikiPath, filesInIndex) {
-			return models.ErrWikiAlreadyExist{
-				Title: newWikiPath,
-			}
-		}
-	} else {
-		oldWikiPath := wiki_service.NameToFilename(oldWikiName)
-		filesInIndex, err := gitRepo.LsFiles(oldWikiPath)
-		if err != nil {
-			log.Error("%v", err)
-			return err
-		}
-
-		if util.IsStringInSlice(oldWikiPath, filesInIndex) {
-			err := gitRepo.RemoveFilesFromIndex(oldWikiPath)
-			if err != nil {
-				log.Error("%v", err)
-				return err
-			}
-		}
-	}
-
-	// FIXME: The wiki doesn't have lfs support at present - if this changes need to check attributes here
-
-	objectHash, err := gitRepo.HashObject(strings.NewReader(content))
-	if err != nil {
-		log.Error("%v", err)
-		return err
-	}
-
-	if err := gitRepo.AddObjectToIndex("100644", objectHash, newWikiPath); err != nil {
-		log.Error("%v", err)
-		return err
-	}
-
-	tree, err := gitRepo.WriteTree()
-	if err != nil {
-		log.Error("%v", err)
-		return err
-	}
-
-	commitTreeOpts := git.CommitTreeOpts{
-		Message: message,
-	}
-
-	sign, signingKey, _ := repo.SignWikiCommit(doer)
-	if sign {
-		commitTreeOpts.KeyID = signingKey
-	} else {
-		commitTreeOpts.NoGPGSign = true
-	}
-	if hasMasterBranch {
-		commitTreeOpts.Parents = []string{"HEAD"}
-	}
-	commitHash, err := gitRepo.CommitTree(doer.NewGitSig(), tree, commitTreeOpts)
-	if err != nil {
-		log.Error("%v", err)
-		return err
-	}
-
-	if err := git.Push(basePath, git.PushOptions{
-		Remote: "origin",
-		Branch: fmt.Sprintf("%s:%s%s", commitHash.String(), git.BranchPrefix, "master"),
-		Env: models.FullPushingEnvironment(
-			doer,
-			doer,
-			repo,
-			repo.Name+".wiki",
-			0,
-		),
-	}); err != nil {
-		log.Error("%v", err)
-		if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) {
-			return err
-		}
-		return fmt.Errorf("Push: %v", err)
-	}
-
-	return nil
-}
-
-// NewWikiPost response for wiki create request
-func NewWikiPost(ctx *context.APIContext, form api.WikiOption) {
-	ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page")
-	ctx.Data["PageIsWiki"] = true
-	ctx.Data["RequireSimpleMDE"] = true
-	if util.IsEmptyString(form.Name) {
-		//ctx.RenderWithErr(ctx.Tr("repo.issues.new.title_empty"), nil, form)
-		return
-	}
-
-	wikiName := wiki_service.NormalizeWikiName(form.Name)
-	if len(form.CommitMessage) == 0 {
-		form.CommitMessage = ctx.Tr("repo.editor.add", form.Name)
-	}
-	if err := wiki_service.AddWikiPage(ctx.User, ctx.Repo.Repository, wikiName, form.Content, form.CommitMessage); err != nil {
-
-		if models.IsErrWikiReservedName(err) {
-			ctx.Data["Err_Title"] = true
-			//ctx.RenderWithErr(ctx.Tr("repo.wiki.reserved_page", wikiName), tplWikiNew, &form)
-		} else if models.IsErrWikiAlreadyExist(err) {
-			ctx.Data["Err_Title"] = true
-			//ctx.RenderWithErr(ctx.Tr("repo.wiki.page_already_exists"), tplWikiNew, &form)
-		} else {
-			//ctx.ServerError("AddWikiPage", err)
-		}
-		return
-	}
-	//ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + wiki_service.NameToSubURL(wikiName))
-}
-func EditWikiPost(ctx *context.APIContext, form api.WikiOption) {
-	ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page")
-	ctx.Data["PageIsWiki"] = true
-	ctx.Data["RequireSimpleMDE"] = true
-
-	oldWikiName := wiki_service.NormalizeWikiName(ctx.Params(":page"))
-	newWikiName := wiki_service.NormalizeWikiName(form.Name)
-
-	//newWikiName, _= url.QueryUnescape(newWikiName)
-
-	if len(form.CommitMessage) == 0 {
-		form.CommitMessage = ctx.Tr("repo.editor.update", form.Name)
-	}
-
-	if err := wiki_service.EditWikiPage(ctx.User, ctx.Repo.Repository, oldWikiName, newWikiName, form.Content, form.CommitMessage); err != nil {
-		ctx.ServerError("EditWikiPage", err)
-		return
-	}
-}
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@ -65,9 +65,6 @@
 package v1

 import (
-	"net/http"
-	"strings"
-
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/context"
@ -84,33 +81,13 @@ import (
 	_ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation
 	"code.gitea.io/gitea/routers/api/v1/user"
 	"code.gitea.io/gitea/routers/api/v1/viewfile"
+	"net/http"
+	"strings"

 	"gitea.com/macaron/binding"
 	"gitea.com/macaron/macaron"
 )

-func MustEnableWiki(ctx *context.Context) {
-	if !ctx.Repo.CanRead(models.UnitTypeWiki) &&
-		!ctx.Repo.CanRead(models.UnitTypeExternalWiki) {
-		if log.IsTrace() {
-			log.Trace("Permission Denied: User %-v cannot read %-v or %-v of repo %-v\n"+
-				"User in repo has Permissions: %-+v",
-				ctx.User,
-				models.UnitTypeWiki,
-				models.UnitTypeExternalWiki,
-				ctx.Repo.Repository,
-				ctx.Repo.Permission)
-		}
-		ctx.NotFound("MustEnableWiki", nil)
-		return
-	}
-
-	unit, err := ctx.Repo.Repository.GetUnit(models.UnitTypeExternalWiki)
-	if err == nil {
-		ctx.Redirect(unit.ExternalWikiConfig().ExternalWikiURL)
-		return
-	}
-}
 func sudo() macaron.Handler {
 	return func(ctx *context.APIContext) {
 		sudo := ctx.Query("sudo")
@ -229,7 +206,7 @@ func reqBasicAuth() macaron.Handler {
 	return func(ctx *context.APIContext) {

 		if !ctx.Context.IsBasicAuth {
-			//	fmt.Println("***********:",http.StatusUnauthorized)
+		//	fmt.Println("***********:",http.StatusUnauthorized)
 			ctx.Context.Error(http.StatusUnauthorized)
 			return
 		}
@ -574,6 +551,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				Patch(notify.ReadThread)
 		}, reqToken())

+
 		m.Group("/users", func() {
 			m.Get("/search", user.Search)

@ -607,6 +585,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			})
 		}, reqToken())

+
 		//数据统计
 		m.Group("/activity", func() {
 			m.Get("", report.GetActivity)
@ -674,8 +653,9 @@ func RegisterRoutes(m *macaron.Macaron) {

 		m.Combo("/repositories/:id", reqToken()).Get(repo.GetByID)

-		m.Group("/repos", func() {

+		//
+		m.Group("/repos", func() {
 			m.Get("/search", repo.Search)

 			m.Get("/issues/search", repo.SearchIssues)
@ -692,30 +672,28 @@ func RegisterRoutes(m *macaron.Macaron) {

 					m.Get("/ext", viewfile.RepoRefByType(context.RepoRefBranch), viewfile.ViewFile)
 					m.Get("/branch/*", viewfile.RepoRefByType(context.RepoRefBranch), viewfile.ViewFile)
-					m.Get("/tag/*", viewfile.RepoRefByType(context.RepoRefTag), viewfile.ViewFile)
+					m.Get("/tag/*",viewfile.RepoRefByType(context.RepoRefTag), viewfile.ViewFile)
 					m.Get("/commit/*", viewfile.RepoRefByType(context.RepoRefCommit), viewfile.ViewFile)

 					//update by 2021-01-12 end  引用自定义包;

 					// alter on 2021/01/15
-					m.Get("", viewfile.Readme)         // reqRepoReader(models.UnitTypeCode),
-					m.Get("/*", viewfile.ReadmeByPath) // reqRepoReader(models.UnitTypeCode),
-
-				})
+					m.Get("",  viewfile.Readme) // reqRepoReader(models.UnitTypeCode),
+				},reqToken())

 				m.Group("/count", func() {
-					m.Get("", viewfile.CommitCount) //****
+					m.Get("",  viewfile.CommitCount) //****
 				})
 				m.Group("/releases", func() {
-					m.Get("/latest", viewfile.LatestRelease) //响应数据待确认 to do;
+					m.Get("/latest",  viewfile.LatestRelease) //响应数据待确认 to do;
 				})
 				//
 				m.Group("/find", func() {
-					m.Get("", viewfile.FindFiles) //文件搜索 ****
+					m.Get("",  viewfile.FindFiles)  //文件搜索 ****
 				})

 				m.Group("/contributors", func() {
-					m.Get("", report.GetContributors) //获取仓库的所有构建者信息 ****
+					m.Get("",  report.GetContributors)  //获取仓库的所有构建者信息 ****
 				})

 				m.Combo("").Get(reqAnyRepoReader(), repo.Get).
@ -725,17 +703,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Combo("/notifications").
 					Get(reqToken(), notify.ListRepoNotifications).
 					Put(reqToken(), notify.ReadRepoNotifications)
-
-				m.Group("/wikies", func() {
-					m.Combo("").Get(repo.WikiList).
-						Post(bind(api.WikiOption{}), repo.CreateWiki)
-					m.Group("/:page", func() {
-						m.Combo("").Get(repo.GetWiki).
-							Patch(bind(api.WikiOption{}), repo.EditWiki).
-							Delete(repo.DeleteWiki)
-					})
-				})
-
 				m.Group("/hooks", func() {
 					m.Combo("").Get(repo.ListHooks).
 						Post(bind(api.CreateHookOption{}), repo.CreateHook)
@ -744,9 +711,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 							Patch(bind(api.EditHookOption{}), repo.EditHook).
 							Delete(repo.DeleteHook)
 						m.Post("/tests", context.RepoRef(), repo.TestHook)
-						m.Get("/hooktasks", repo.ListHookTask)
 					})
-
 					m.Group("/git", func() {
 						m.Combo("").Get(repo.ListGitHooks)
 						m.Group("/:id", func() {
@ -792,7 +757,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 					Post(reqToken(), reqRepoReader(models.UnitTypeCode), bind(api.CreateForkOption{}), repo.CreateFork)
 				m.Group("/branches", func() {
 					m.Get("", repo.ListBranches)
-					m.Get("/branches_slice", repo.ListBranchesSlice)
 					m.Get("/*", context.RepoRefByType(context.RepoRefBranch), repo.GetBranch)
 					m.Delete("/*", reqRepoWriter(models.UnitTypeCode), context.RepoRefByType(context.RepoRefBranch), repo.DeleteBranch)
 					m.Post("", reqRepoWriter(models.UnitTypeCode), bind(api.CreateBranchRepoOption{}), repo.CreateBranch)
@ -949,16 +913,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 				}, reqRepoReader(models.UnitTypeCode))
 				m.Group("/commits", func() {
 					m.Get("", repo.GetAllCommits)
-
 					m.Group("/:ref", func() {
 						m.Get("/status", repo.GetCombinedCommitStatusByRef)
 						m.Get("/statuses", repo.GetCommitStatusesByRef)
 					})
 				}, reqRepoReader(models.UnitTypeCode))
-				m.Get("/commits_slice", repo.GetAllCommitsSliceByTime)
-				m.Group("/file_commits", func() {
-					m.Get("/*", repo.GetFileAllCommits)
-				})
 				m.Group("/git", func() {
 					m.Group("/commits", func() {
 						m.Get("/:sha", repo.GetSingleCommit)
@ -995,8 +954,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 		// Organizations
 		m.Get("/user/orgs", reqToken(), org.ListMyOrgs)
 		m.Get("/users/:username/orgs", org.ListUserOrgs)
-		// modified on 2021-01-14 begin 创建组织时返回默认的团队 begin
-		//m.Post("/orgs", reqToken(), bind(api.CreateOrgOption{}), org.Create)
+        // modified on 2021-01-14 begin 创建组织时返回默认的团队 begin
+        //m.Post("/orgs", reqToken(), bind(api.CreateOrgOption{}), org.Create)
 		m.Post("/orgs", reqToken(), bind(api.CreateOrgOption{}), org.CreateExt)
 		// modified on 2021-01-14 begin 创建组织时返回默认的团队 end

--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@ -6,10 +6,6 @@
 package repo

 import (
-	"fmt"
-	"net/http"
-	"sort"
-
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/convert"
@ -18,6 +14,8 @@ import (
 	"code.gitea.io/gitea/modules/repofiles"
 	repo_module "code.gitea.io/gitea/modules/repository"
 	api "code.gitea.io/gitea/modules/structs"
+	"fmt"
+	"net/http"
 )

 // GetBranch get a branch of a repository
@ -47,6 +45,8 @@ func GetBranch(ctx *context.APIContext) {
 	//   "200":
 	//     "$ref": "#/responses/Branch"

+
+
 	if ctx.Repo.TreePath != "" {
 		// if TreePath != "", then URL contained extra slashes
 		// (i.e. "master/subbranch" instead of "master"), so branch does
@ -328,92 +328,6 @@ func ListBranches(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiBranches)
 }

-// ListBranches list all the branches of a repository
-func ListBranchesSlice(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/branches/branches_slice repository repoListBranchesSlice
-	// ---
-	// summary: List a repository's branches, Group sort.
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/BranchList"
-
-	//start:=time.Now()
-	branches, err := repo_module.GetBranches(ctx.Repo.Repository)
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetBranches", err)
-		return
-	}
-	//fmt.Println("***************** *GetBranches:",time.Now().Sub(start)," ",branches,len(branches))
-
-	apiBranches := make([]*api.Branch, len(branches))
-
-	// add configure
-	apiBranchesList := []api.Branch{}
-	for i := range branches {
-		c, err := branches[i].GetCommit()
-		if err != nil {
-			ctx.Error(http.StatusInternalServerError, "GetCommit", err)
-			return
-		}
-		//fmt.Println("****branches[i]:",branches[i])
-		branchProtection, err := ctx.Repo.Repository.GetBranchProtection(branches[i].Name)
-		if err != nil {
-			ctx.Error(http.StatusInternalServerError, "GetBranchProtection", err)
-			return
-		}
-		//fmt.Println("****branchProtection:",branchProtection)
-		apiBranches[i], err = convert.ToBranch(ctx.Repo.Repository, branches[i], c, branchProtection, ctx.User, ctx.Repo.IsAdmin())
-		if err != nil {
-			ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err)
-			return
-		}
-		apiBranchesList = append(apiBranchesList, *apiBranches[i])
-		//fmt.Println("****apiBranches[i]:",apiBranches[i])
-	}
-
-	ctx.JSON(http.StatusOK, BranchesSliceByProtection(ctx, apiBranchesList))
-}
-
-// branches slice. Group by protection
-
-func BranchesSliceByProtection(ctx *context.APIContext, branchList []api.Branch) []api.BranchesSlice {
-	// group by protection
-	sort.Sort(api.SortBranch(branchList))
-	branchSlice := make([]api.BranchesSlice, 0)
-	i := 0
-	var j int
-	for {
-		if i >= len(branchList) {
-			break
-		}
-		for j = i + 1; j < len(branchList) && (branchList[i].BranchKind == branchList[j].BranchKind); j++ {
-		}
-		// get the same branches
-		sameBranchSlice := branchList[i:j]
-		// sort by time
-		sort.Sort(api.SortBranchTime(sameBranchSlice))
-		branchSlice = append(branchSlice, api.BranchesSlice{
-			BranchName: convert.ToBranchType(branchList[i].BranchKind).Name(),
-			Branches:   sameBranchSlice,
-		})
-		i = j
-	}
-	return branchSlice
-}
-
 // GetBranchProtection gets a branch protection
 func GetBranchProtection(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/branch_protections/{name} repository repoGetBranchProtection
--- a/routers/api/v1/repo/commits.go
+++ b/routers/api/v1/repo/commits.go
@ -9,19 +9,18 @@ import (
 	"fmt"
 	"math"
 	"net/http"
-	"sort"
 	"strconv"
 	"time"

 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/gitgraph"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/gitgraph"
+	"code.gitea.io/gitea/services/gitdiff"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/validation"
 	"code.gitea.io/gitea/routers/api/v1/utils"
-	"code.gitea.io/gitea/services/gitdiff"
 )

 // GetSingleCommit get a commit via sha
@ -84,140 +83,6 @@ func getCommit(ctx *context.APIContext, identifier string) {
 	ctx.JSON(http.StatusOK, json)
 }

-// GetFileCommits get all commits by path on a repository
-func GetFileAllCommits(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/file_commits/{filepath} repository repoGetFileAllCommits
-	// ---
-	// summary: Get a list of all commits by filepath from a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: filepath
-	//   in: path
-	//   description: filepath of the file to get
-	//   type: string
-	//   required: true
-	// - name: sha
-	//   in: query
-	//   description: SHA or branch to start listing commits from (usually 'master')
-	//   type: string
-	// - name: page
-	//   in: query
-	//   description: page number of results to return (1-based)
-	//   type: integer
-	// - name: limit
-	//   in: query
-	//   description: page size of results
-	//   type: integer
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/FileCommitList"
-	//   "404":
-	//     "$ref": "#/responses/notFound"
-	//   "409":
-	//     "$ref": "#/responses/EmptyRepository"
-
-	if ctx.Repo.Repository.IsEmpty {
-		ctx.JSON(http.StatusConflict, api.APIError{
-			Message: "Git Repository is empty.",
-			URL:     setting.API.SwaggerURL,
-		})
-		return
-	}
-
-	gitRepo, err := git.OpenRepository(ctx.Repo.Repository.RepoPath())
-	if err != nil {
-		ctx.ServerError("OpenRepository", err)
-		return
-	}
-	defer gitRepo.Close()
-
-	listOptions := utils.GetListOptions(ctx)
-	if listOptions.Page <= 0 {
-		listOptions.Page = 1
-	}
-
-	if listOptions.PageSize > git.CommitsRangeSize {
-		listOptions.PageSize = git.CommitsRangeSize
-	}
-
-	sha := ctx.Query("sha")
-	treePath := ctx.Params("*")
-	var baseCommit *git.Commit
-	var commitsCountTotal int64
-	if len(sha) == 0 {
-		head, err := gitRepo.GetHEADBranch()
-		if err != nil {
-			ctx.ServerError("GetHEADBranch", err)
-			return
-		}
-
-		baseCommit, err = gitRepo.GetBranchCommit(head.Name)
-		if err != nil {
-			ctx.ServerError("GetCommit", err)
-			return
-		}
-		commitsCountTotal, err = git.CommitsCountByFile(gitRepo.Path, head.Name, treePath)
-		if err != nil {
-			ctx.ServerError("CommitsCount", err)
-			return
-		}
-	} else {
-		baseCommit, err = gitRepo.GetCommit(sha)
-		if err != nil {
-			ctx.ServerError("GetCommit", err)
-			return
-		}
-		commitsCountTotal, err = git.CommitsCountByFile(gitRepo.Path, sha, treePath)
-		if err != nil {
-			ctx.ServerError("CommitsCount", err)
-			return
-		}
-	}
-
-	pageCount := int(math.Ceil(float64(commitsCountTotal) / float64(listOptions.PageSize)))
-
-	commits, err := baseCommit.CommitsByFileAndRange(treePath, listOptions.Page, listOptions.PageSize)
-	if err != nil {
-		ctx.ServerError("CommitsByRange", err)
-		return
-	}
-
-	userCache := make(map[string]*models.User)
-	apiCommits := make([]*api.Commit, commits.Len())
-	i := 0
-	for commitPointer := commits.Front(); commitPointer != nil; commitPointer = commitPointer.Next() {
-		commit := commitPointer.Value.(*git.Commit)
-		apiCommits[i], err = toCommit(ctx, ctx.Repo.Repository, commit, userCache)
-		if err != nil {
-			ctx.ServerError("toCommit", err)
-			return
-		}
-
-		i++
-	}
-
-	ctx.Header().Set("X-Page", strconv.Itoa(listOptions.Page))
-	ctx.Header().Set("X-PerPage", strconv.Itoa(listOptions.PageSize))
-	ctx.Header().Set("X-Total", strconv.FormatInt(commitsCountTotal, 10))
-	ctx.Header().Set("X-PageCount", strconv.Itoa(pageCount))
-	ctx.Header().Set("X-HasMore", strconv.FormatBool(listOptions.Page < pageCount))
-	ctx.SetLinkHeader(int(commitsCountTotal), listOptions.PageSize)
-	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", commitsCountTotal))
-
-	ctx.JSON(http.StatusOK, apiCommits)
-}
-
 // GetAllCommits get all commits via
 func GetAllCommits(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/commits repository repoGetAllCommits
@ -324,10 +189,7 @@ func GetAllCommits(ctx *context.APIContext) {
 	userCache := make(map[string]*models.User)

 	apiCommits := make([]*api.Commit, commits.Len())
-	// =============================================================
-	// apiCommitsList := []api.Commit{}

-	// =================================================================
 	i := 0
 	for commitPointer := commits.Front(); commitPointer != nil; commitPointer = commitPointer.Next() {
 		commit := commitPointer.Value.(*git.Commit)
@ -338,7 +200,6 @@ func GetAllCommits(ctx *context.APIContext) {
 			ctx.ServerError("toCommit", err)
 			return
 		}
-		// apiCommitsList = append(apiCommitsList,*apiCommits[i])

 		i++
 	}
@ -353,168 +214,7 @@ func GetAllCommits(ctx *context.APIContext) {
 	ctx.SetLinkHeader(int(commitsCountTotal), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", commitsCountTotal))

-	ctx.JSON(http.StatusOK, apiCommits)
-}
-
-// GetAllCommits get all commits via
-func GetAllCommitsSliceByTime(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/commits_slice repository repoGetAllCommitsSlice
-	// ---
-	// summary: Get a list of all commits from a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: sha
-	//   in: query
-	//   description: SHA or branch to start listing commits from (usually 'master')
-	//   type: string
-	// - name: page
-	//   in: query
-	//   description: page number of results to return (1-based)
-	//   type: integer
-	// - name: limit
-	//   in: query
-	//   description: page size of results
-	//   type: integer
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/CommitList"
-	//   "404":
-	//     "$ref": "#/responses/notFound"
-	//   "409":
-	//     "$ref": "#/responses/EmptyRepository"
-
-	if ctx.Repo.Repository.IsEmpty {
-		ctx.JSON(http.StatusConflict, api.APIError{
-			Message: "Git Repository is empty.",
-			URL:     setting.API.SwaggerURL,
-		})
-		return
-	}
-
-	gitRepo, err := git.OpenRepository(ctx.Repo.Repository.RepoPath())
-	if err != nil {
-		ctx.ServerError("OpenRepository", err)
-		return
-	}
-	defer gitRepo.Close()
-
-	listOptions := utils.GetListOptions(ctx)
-	if listOptions.Page <= 0 {
-		listOptions.Page = 1
-	}
-
-	if listOptions.PageSize > git.CommitsRangeSize {
-		listOptions.PageSize = git.CommitsRangeSize
-	}
-
-	sha := ctx.Query("sha")
-
-	var baseCommit *git.Commit
-	if len(sha) == 0 {
-		// no sha supplied - use default branch
-		head, err := gitRepo.GetHEADBranch()
-		if err != nil {
-			ctx.ServerError("GetHEADBranch", err)
-			return
-		}
-
-		baseCommit, err = gitRepo.GetBranchCommit(head.Name)
-		if err != nil {
-			ctx.ServerError("GetCommit", err)
-			return
-		}
-	} else {
-		// get commit specified by sha
-		baseCommit, err = gitRepo.GetCommit(sha)
-		if err != nil {
-			ctx.ServerError("GetCommit", err)
-			return
-		}
-	}
-
-	// Total commit count
-	commitsCountTotal, err := baseCommit.CommitsCount()
-	if err != nil {
-		ctx.ServerError("GetCommitsCount", err)
-		return
-	}
-
-	pageCount := int(math.Ceil(float64(commitsCountTotal) / float64(listOptions.PageSize)))
-
-	// Query commits
-	commits, err := baseCommit.CommitsByRange(listOptions.Page, listOptions.PageSize)
-	if err != nil {
-		ctx.ServerError("CommitsByRange", err)
-		return
-	}
-
-	userCache := make(map[string]*models.User)
-
-	apiCommits := make([]*api.Commit, commits.Len())
-	apiCommitsList := []api.Commit{}
-	i := 0
-	for commitPointer := commits.Front(); commitPointer != nil; commitPointer = commitPointer.Next() {
-		commit := commitPointer.Value.(*git.Commit)
-
-		// Create json struct
-		apiCommits[i], err = toCommit(ctx, ctx.Repo.Repository, commit, userCache)
-		if err != nil {
-			ctx.ServerError("toCommit", err)
-			return
-		}
-		apiCommitsList = append(apiCommitsList, *apiCommits[i])
-
-		i++
-	}
-
-	// kept for backwards compatibility
-	ctx.Header().Set("X-Page", strconv.Itoa(listOptions.Page))
-	ctx.Header().Set("X-PerPage", strconv.Itoa(listOptions.PageSize))
-	ctx.Header().Set("X-Total", strconv.FormatInt(commitsCountTotal, 10))
-	ctx.Header().Set("X-PageCount", strconv.Itoa(pageCount))
-	ctx.Header().Set("X-HasMore", strconv.FormatBool(listOptions.Page < pageCount))
-
-	ctx.SetLinkHeader(int(commitsCountTotal), listOptions.PageSize)
-	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", commitsCountTotal))
-
-	ctx.JSON(http.StatusOK, CommitSplitSlice(apiCommitsList))
-}
-
-func CommitSplitSlice(CommitsList []api.Commit) []api.CommitsSlice {
-	// sort by time
-	sort.Sort(api.SortCommit(CommitsList))
-	Commits := make([]api.CommitsSlice, 0)
-	i := 0
-	var j int
-	for {
-		if i >= len(CommitsList) {
-			break
-		}
-		// Detect equal CommitData,
-		for j = i + 1; j < len(CommitsList) && CommitsList[i].CommitDate == CommitsList[j].CommitDate; j++ {
-		}
-		// if equal, put commitdata in an array
-		commitDate := CommitsList[i].CommitDate
-		commitDatalist := CommitsList[i:j]
-		i = j // variable value
-		// get all the values,,,Commits
-		Commits = append(Commits, api.CommitsSlice{
-			CommitDate: commitDate,
-			Commits:    commitDatalist,
-		})
-	}
-	return Commits
+	ctx.JSON(http.StatusOK, &apiCommits)
 }

 func toCommit(ctx *context.APIContext, repo *models.Repository, commit *git.Commit, userCache map[string]*models.User) (*api.Commit, error) {
@ -577,9 +277,8 @@ func toCommit(ctx *context.APIContext, repo *models.Repository, commit *git.Comm
 			SHA: sha.String(),
 		}
 	}
-	commit.LoadBranchName()
+
 	return &api.Commit{
-		CommitDate: commit.Committer.When.Format("2006-01-02"), // new time format, year-moon-day
 		CommitMeta: &api.CommitMeta{
 			URL: repo.APIURL() + "/git/commits/" + commit.ID.String(),
 			SHA: commit.ID.String(),
@ -610,16 +309,14 @@ func toCommit(ctx *context.APIContext, repo *models.Repository, commit *git.Comm
 		Author:    apiAuthor,
 		Committer: apiCommitter,
 		Parents:   apiParents,
-		Branch:    commit.Branch,
 	}, nil
 }

 // add by qiubing
 // 获取 Graph
 func GetGraph(ctx *context.APIContext) {
-
 	if ctx.Repo.Repository.IsEmpty { // 项目是否为空
-		ctx.JSON(http.StatusConflict, api.APIError{
+		ctx.JSON(409, api.APIError{
 			Message: "Git Repository is empty.",
 			URL:     setting.API.SwaggerURL,
 		})
@ -637,7 +334,7 @@ func GetGraph(ctx *context.APIContext) {
 		return
 	}

-	ctx.JSON(http.StatusOK, &graph)
+	ctx.JSON(200, &graph)
 }

 // 获取 commit diff
@ -653,7 +350,7 @@ func Diff(ctx *context.APIContext) {
 		ctx.NotFound("GetDiffCommit", err)
 		return
 	}
-	ctx.JSON(http.StatusOK, &diff)
+	ctx.JSON(200, &diff)
 }

 // 获取文件 blame 信息
@ -718,7 +415,7 @@ func GetCommitsCount(ctx *context.APIContext) {
 		ctx.ServerError("GetCommitsCount", err)
 		return
 	}
-	ctx.JSON(http.StatusOK, &ctx.Repo)
+	ctx.JSON(200, &ctx.Repo)
 }

 // end by qiubing
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@ -57,11 +57,6 @@ func GetRawFile(ctx *context.APIContext) {
 	//   description: filepath of the file to get
 	//   type: string
 	//   required: true
-	// - name: ref
-	//   in: query
-	//   description: "The name of the commit/branch/tag. Default the repository’s default branch (usually master)"
-	//   type: string
-	//   required: false
 	// responses:
 	//   200:
 	//     description: success
@ -73,14 +68,7 @@ func GetRawFile(ctx *context.APIContext) {
 		return
 	}

-	ref := ctx.QueryTrim("ref")
-
-	commit, err := ctx.Repo.GitRepo.GetCommit(ref)
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetCommit", err)
-		return
-	}
-	blob, err := commit.GetBlobByPath(ctx.Repo.TreePath)
+	blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreePath)
 	if err != nil {
 		if git.IsErrNotExist(err) {
 			ctx.NotFound()
@ -540,7 +528,8 @@ func GetContents(ctx *context.APIContext) {
 	//   "404":
 	//     "$ref": "#/responses/notFound"

-	start := time.Now()
+
+	start:=time.Now()

 	if !canReadFiles(ctx.Repo) {
 		ctx.Error(http.StatusInternalServerError, "GetContentsOrList", models.ErrUserDoesNotHaveAccessToRepo{
@ -553,8 +542,8 @@ func GetContents(ctx *context.APIContext) {
 	treePath := ctx.Params("*")
 	ref := ctx.QueryTrim("ref")

-	fmt.Println("***GetContents.treePath:", treePath)
-	fmt.Println("***GetContents.ref:", ref)
+	fmt.Println("***GetContents.treePath:",treePath)
+	fmt.Println("***GetContents.ref:",ref)
 	if fileList, err := repofiles.GetContentsOrList(ctx.Repo.Repository, treePath, ref); err != nil {
 		if git.IsErrNotExist(err) {
 			ctx.NotFound("GetContentsOrList", err)
@ -564,7 +553,7 @@ func GetContents(ctx *context.APIContext) {
 	} else {
 		ctx.JSON(http.StatusOK, fileList)
 	}
-	log.Info("*****************GetContents:%v", time.Now().Sub(start))
+	log.Info("*****************GetContents:%v",time.Now().Sub(start))
 }

 // add by qiubing
--- a/routers/api/v1/repo/hook.go
+++ b/routers/api/v1/repo/hook.go
@ -6,7 +6,6 @@
 package repo

 import (
-	_ "fmt"
 	"net/http"

 	"code.gitea.io/gitea/models"
@ -265,56 +264,3 @@ func DeleteHook(ctx *context.APIContext) {
 	}
 	ctx.Status(http.StatusNoContent)
 }
-
-func ListHookTask(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/hooks/{id}/hooktasks repository repoGetHookTasks
-	// ---
-	// summary: Get a hooktasks
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: id
-	//   in: path
-	//   description: id of the hook
-	//   type: integer
-	//   format: int64
-	//   required: true
-	// - name: page
-	//   in: query
-	//   description: page number of results to return (1-based)
-	//   type: integer
-	// - name: limit
-	//   in: query
-	//   description: page size of results
-	//   type: integer
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/HookTaskList"
-	hook, err := utils.GetRepoHook(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
-	if err != nil {
-		ctx.NotFound()
-		return
-	}
-	hookTasks, err := models.GetHookTasksByRepoIDAndHookID(ctx.Repo.Repository.ID, hook.ID, utils.GetListOptions(ctx))
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetHookTasksByRepoIDAndHookID", err)
-		return
-	}
-
-	apiHookTasks := make([]*api.HookTask, len(hookTasks))
-	for i := range hookTasks {
-		apiHookTasks[i] = convert.ToHookTask(hookTasks[i])
-	}
-
-	ctx.JSON(http.StatusOK, &apiHookTasks)
-}
--- a/routers/api/v1/repo/tag.go
+++ b/routers/api/v1/repo/tag.go
@ -5,10 +5,7 @@
 package repo

 import (
-	"fmt"
-	"math"
 	"net/http"
-	"strconv"

 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/convert"
@ -59,22 +56,6 @@ func ListTags(ctx *context.APIContext) {
 		apiTags[i] = convert.ToTag(ctx.Repo.Repository, tags[i])
 	}

-	tagsCountTotal, err := ctx.Repo.GitRepo.GetTagCount()
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetTagCount", err)
-		return
-	}
-
-	pageCount := int(math.Ceil(float64(tagsCountTotal) / float64(listOpts.PageSize)))
-	ctx.Header().Set("X-Page", strconv.Itoa(listOpts.Page))
-	ctx.Header().Set("X-PerPage", strconv.Itoa(listOpts.PageSize))
-	ctx.Header().Set("X-Total", strconv.FormatInt(tagsCountTotal, 10))
-	ctx.Header().Set("X-PageCount", strconv.Itoa(pageCount))
-	ctx.Header().Set("X-HasMore", strconv.FormatBool(listOpts.Page < pageCount))
-
-	ctx.SetLinkHeader(int(tagsCountTotal), listOpts.PageSize)
-	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", tagsCountTotal))
-
 	ctx.JSON(http.StatusOK, &apiTags)
 }

--- a/routers/api/v1/repo/wiki.go
+++ b/routers/api/v1/repo/wiki.go
@ -1,434 +0,0 @@
-package repo
-
-//
-import (
-	"net/http"
-	"sort"
-
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/context"
-	"code.gitea.io/gitea/modules/markup/markdown"
-	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/modules/util"
-	"code.gitea.io/gitea/modules/wikies"
-	wiki_service "code.gitea.io/gitea/services/wiki"
-)
-
-func WikiList(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/wikies  repository repoWikiList
-	// ---
-	// summary: List the wikies in a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/WikiList"
-
-	if !ctx.Repo.Repository.HasWiki() {
-		ctx.CheckHasWiki()
-		return
-	}
-	repository := ctx.Repo.Repository
-	wikiCloneLink := repository.CloneWikiLink()
-	wikiRepo, commit, err := wikies.FindWikiRepoCommit(ctx)
-	if err != nil {
-		if wikiRepo != nil {
-			wikiRepo.Close()
-		}
-		return
-	}
-	entries, err := commit.ListEntries()
-	if err != nil {
-		if wikiRepo != nil {
-			wikiRepo.Close()
-		}
-		return
-	}
-	wikiesList := make([]api.WikiesResponse, 0, len(entries))
-	for _, entry := range entries {
-		if !entry.IsRegular() {
-			continue
-		}
-		//c, err := wikiRepo.GetCommitByPath(entry.Name())
-		lastCommit, firstCommit, err := wikiRepo.GetFirstAndLastCommitByPath("master", entry.Name())
-		if err != nil {
-			if wikiRepo != nil {
-				wikiRepo.Close()
-			}
-			ctx.ServerError("GetCommit", err)
-			return
-		}
-		wikiName, err := wiki_service.FilenameToName(entry.Name())
-		if err != nil {
-			if models.IsErrWikiInvalidFileName(err) {
-				continue
-			}
-			if wikiRepo != nil {
-				wikiRepo.Close()
-			}
-			ctx.ServerError("WikiFilenameToName", err)
-			return
-		}
-		wikiesList = append(wikiesList, api.WikiesResponse{
-			WikiCloneLink: api.CloneLink{
-				HTTPS: wikiCloneLink.HTTPS,
-				SSH:   wikiCloneLink.SSH,
-			},
-			WikiMeta: api.WikiMeta{
-				Name: wikiName,
-				Commit: api.WikiCommit{
-					Author: api.WikiUser{
-						Name:  lastCommit.Author.Name,
-						Email: lastCommit.Author.Email,
-						When:  lastCommit.Author.When.Unix(),
-					},
-					Commiter: api.WikiUser{
-						Name:  lastCommit.Committer.Name,
-						Email: lastCommit.Committer.Email,
-						When:  lastCommit.Author.When.Unix(),
-					},
-					ID:      lastCommit.ID.String(),
-					Message: lastCommit.Message(),
-				},
-				FirstCommit: api.WikiCommit{
-					Author: api.WikiUser{
-						Name:  firstCommit.Author.Name,
-						Email: firstCommit.Author.Email,
-						When:  firstCommit.Author.When.Unix(),
-					},
-					Commiter: api.WikiUser{
-						Name:  firstCommit.Committer.Name,
-						Email: firstCommit.Committer.Email,
-						When:  firstCommit.Author.When.Unix(),
-					},
-					ID:      firstCommit.ID.String(),
-					Message: firstCommit.Message(),
-				},
-			},
-		})
-	}
-
-	//根据创建时间，按最新的时间排序
-	sort.Slice(wikiesList, func(i, j int) bool {
-		return wikiesList[i].FirstCommit.Author.When > wikiesList[j].FirstCommit.Author.When
-	})
-	ctx.JSON(http.StatusOK, wikiesList)
-}
-
-func GetWiki(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/wikies/{pagename} repository repoGetWiki
-	// ---
-	// summary: Get a Wiki
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: pagename
-	//   in: path
-	//   description: name of the wikipage
-	//   type: string
-	//   required: true
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/Wiki"
-
-	wikiRepo, commit, _ := wikies.FindWikiRepoCommit(ctx)
-	repository := ctx.Repo.Repository
-	wikiCloneLink := repository.CloneWikiLink()
-	pageName := wiki_service.NormalizeWikiName(ctx.Params(":page"))
-	if len(pageName) == 0 {
-		pageName = "Home"
-	}
-	data, entry, pageFilename, noEntry := wikies.WikiContentsByName(ctx, commit, pageName)
-	if noEntry {
-		ctx.NotFound()
-		return
-	}
-	if entry == nil || ctx.Written() {
-		if wikiRepo != nil {
-			wikiRepo.Close()
-		}
-	}
-	metas := ctx.Repo.Repository.ComposeDocumentMetas()
-	PageContent := markdown.RenderWiki(data, ctx.Repo.RepoLink, metas)
-
-	c, err := wikiRepo.GetCommitByPath(entry.Name())
-	if err != nil {
-		if models.IsErrWikiInvalidFileName(err) {
-			return
-		}
-	}
-	commitsCount, _ := wikiRepo.FileCommitsCount("master", pageFilename)
-	wiki := api.WikiResponse{
-		WikiCloneLink: api.CloneLink{
-			HTTPS: wikiCloneLink.HTTPS,
-			SSH:   wikiCloneLink.SSH,
-		},
-		WikiMeta: api.WikiMeta{
-			Name: pageName,
-			Commit: api.WikiCommit{
-				Author: api.WikiUser{
-					Name:  c.Author.Name,
-					Email: c.Author.Email,
-					When:  c.Author.When.Unix(),
-				},
-				Commiter: api.WikiUser{
-					Name:  c.Committer.Name,
-					Email: c.Committer.Email,
-					When:  c.Author.When.Unix(),
-				},
-				ID:      c.ID.String(),
-				Message: c.Message(),
-			},
-		},
-		CommitCounts:  commitsCount,
-		MdContent:     string(data),
-		SimpleContent: PageContent,
-	}
-	ctx.JSON(http.StatusOK, wiki)
-}
-
-func CreateWiki(ctx *context.APIContext, form api.WikiOption) {
-	// swagger:operation POST /repos/{owner}/{repo}/wikies  repository repoCreateWiki
-	// ---
-	// summary:  Create a wiki in a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: body
-	//   in: body
-	//   schema:
-	//     "$ref": "#/definitions/WikiOption"
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/Wiki"
-
-	err1 := wiki_service.CheckFile(form.Name)
-	if err1 != nil {
-		ctx.FileNameError()
-		return
-	}
-	repository := ctx.Repo.Repository
-	wikiCloneLink := repository.CloneWikiLink()
-	if util.IsEmptyString(form.Name) {
-		//ctx.RenderWithErr(ctx.Tr("repo.issues.new.title_empty"), nil, form)
-		return
-	}
-
-	wikiName := wiki_service.NormalizeWikiName(form.Name)
-	if len(form.CommitMessage) == 0 {
-		form.CommitMessage = ctx.Tr("repo.editor.add", form.Name)
-	}
-	if err := wiki_service.AddWikiPage(ctx.User, ctx.Repo.Repository, wikiName, form.Content, form.CommitMessage); err != nil {
-
-		if models.IsErrWikiReservedName(err) {
-			ctx.Error(http.StatusInternalServerError, "WikiNameIsReservedPage", "wiki名称是被保留的.")
-		} else if models.IsErrWikiAlreadyExist(err) {
-			ctx.Error(http.StatusConflict, "WikiNameAlreadyExist", "wiki名称已存在")
-		} else {
-			ctx.Error(http.StatusInternalServerError, "AddWikiPage", err)
-		}
-		return
-	}
-	wikiRepo, commit, _ := wikies.FindWikiRepoCommit(ctx)
-	data, entry, pageFilename, _ := wikies.WikiContentsByName(ctx, commit, form.Name)
-	metas := ctx.Repo.Repository.ComposeDocumentMetas()
-	PageContent := markdown.RenderWiki(data, ctx.Repo.RepoLink, metas)
-	commitsCount, _ := wikiRepo.FileCommitsCount("master", pageFilename)
-	c, err := wikiRepo.GetCommitByPath(entry.Name())
-	if err != nil {
-		if models.IsErrWikiInvalidFileName(err) {
-			return
-		}
-	}
-	wiki := api.WikiResponse{
-		WikiCloneLink: api.CloneLink{
-			HTTPS: wikiCloneLink.HTTPS,
-			SSH:   wikiCloneLink.SSH,
-		},
-		WikiMeta: api.WikiMeta{
-			Name: form.Name,
-			Commit: api.WikiCommit{
-				Author: api.WikiUser{
-					Name:  c.Author.Name,
-					Email: c.Author.Email,
-					When:  c.Author.When.Unix(),
-				},
-				Commiter: api.WikiUser{
-					Name:  c.Committer.Name,
-					Email: c.Committer.Email,
-					When:  c.Author.When.Unix(),
-				},
-				ID:      c.ID.String(),
-				Message: c.Message(),
-			},
-		},
-		CommitCounts:  commitsCount,
-		MdContent:     string(data),
-		SimpleContent: PageContent,
-	}
-	ctx.JSON(http.StatusOK, wiki)
-}
-
-func EditWiki(ctx *context.APIContext, form api.WikiOption) {
-	// swagger:operation PATCH /repos/{owner}/{repo}/wikies/{pagename}   repository repoEditWiki
-	// ---
-	// summary: Edit a wiki in a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: pagename
-	//   in: path
-	//   description: name of the wiki
-	//   type: string
-	//   required: true
-	// - name: body
-	//   in: body
-	//   schema:
-	//     "$ref": "#/definitions/WikiOption"
-	// responses:
-	//   "201":
-	//     "$ref": "#/responses/Wiki"
-
-	oldWikiName := wiki_service.NormalizeWikiName(ctx.Params(":page"))
-	newWikiName := wiki_service.NormalizeWikiName(form.Name)
-	err1 := wiki_service.CheckFile(newWikiName)
-	if err1 != nil {
-		ctx.FileNameError()
-		return
-	}
-	wikiRepo, commit, _ := wikies.FindWikiRepoCommit(ctx)
-
-	if _, _, _, noEntry := wikies.WikiContentsByName(ctx, commit, oldWikiName); noEntry {
-		ctx.Error(http.StatusNotFound, "WikiNotFound", "wiki不存在")
-		return
-	}
-
-	if _, _, _, noEntry := wikies.WikiContentsByName(ctx, commit, newWikiName); oldWikiName != newWikiName && !noEntry {
-		ctx.Error(http.StatusConflict, "WikiNameAlreadyExist", "wiki名称已存在")
-		return
-	}
-
-	if len(form.CommitMessage) == 0 {
-		form.CommitMessage = ctx.Tr("repo.editor.update", form.Name)
-	}
-
-	if err := wiki_service.EditWikiPage(ctx.User, ctx.Repo.Repository, oldWikiName, newWikiName, form.Content, form.CommitMessage); err != nil {
-		ctx.Error(http.StatusInternalServerError, "EditWikiPage", err)
-		return
-	}
-	_, newCommit, _ := wikies.FindWikiRepoCommit(ctx)
-	data, entry, pageFilename, _ := wikies.WikiContentsByName(ctx, newCommit, newWikiName)
-	c, err := wikiRepo.GetCommitByPath(entry.Name())
-	if err != nil {
-		if models.IsErrWikiInvalidFileName(err) {
-			return
-		}
-	}
-	metas := ctx.Repo.Repository.ComposeDocumentMetas()
-	PageContent := markdown.RenderWiki(data, ctx.Repo.RepoLink, metas)
-	commitsCount, _ := wikiRepo.FileCommitsCount("master", pageFilename)
-
-	wiki := api.WikiResponse{
-		WikiMeta: api.WikiMeta{
-			Name: form.Name,
-			Commit: api.WikiCommit{
-				Author: api.WikiUser{
-					Name:  c.Author.Name,
-					Email: c.Author.Email,
-					When:  c.Author.When.Unix(),
-				},
-				Commiter: api.WikiUser{
-					Name:  c.Committer.Name,
-					Email: c.Committer.Email,
-					When:  c.Author.When.Unix(),
-				},
-				ID:      c.ID.String(),
-				Message: c.Message(),
-			},
-		},
-		CommitCounts:  commitsCount,
-		MdContent:     string(data),
-		SimpleContent: PageContent,
-	}
-	ctx.JSON(http.StatusOK, wiki)
-}
-func DeleteWiki(ctx *context.APIContext) {
-	// swagger:operation DELETE /repos/{owner}/{repo}/wikies/{pagename} repository repoDeleteWiki
-	// ---
-	// summary: Delete a wiki in a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: pagename
-	//   in: path
-	//   description: name of the wiki
-	//   type: string
-	//   required: true
-	// responses:
-	//   "204":
-	//     "$ref": "#/responses/empty"
-	//   "500":
-	//     "$ref": "#/responses/noFound"
-
-	wikiName := wiki_service.NormalizeWikiName(ctx.Params(":page"))
-	if len(wikiName) == 0 {
-		wikiName = "Home"
-	}
-
-	err2 := wiki_service.DeleteWikiPage(ctx.User, ctx.Repo.Repository, wikiName)
-	if err2 != nil {
-		ctx.FileExistError()
-		return
-	}
-}
--- a/routers/api/v1/swagger/options.go
+++ b/routers/api/v1/swagger/options.go
@ -23,9 +23,6 @@ type swaggerParameterBodies struct {
 	// in:body
 	DeleteEmailOption api.DeleteEmailOption

-	// in:body
-	WikiOption api.WikiOption
-
 	// in:body
 	CreateHookOption api.CreateHookOption
 	// in:body
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@ -53,21 +53,6 @@ type swaggerResponseBranchProtectionList struct {
 // TagList
 // swagger:response TagList
 type swaggerResponseTagList struct {
-	// The current page
-	Page int `json:"X-Page"`
-
-	// Commits per page
-	PerPage int `json:"X-PerPage"`
-
-	// Total commit count
-	Total int `json:"X-Total"`
-
-	// Total number of pages
-	PageCount int `json:"X-PageCount"`
-
-	// True if there is another page
-	HasMore bool `json:"X-HasMore"`
-
 	// in:body
 	Body []api.Tag `json:"body"`
 }
@ -100,20 +85,6 @@ type swaggerResponseReferenceList struct {
 	Body []api.Reference `json:"body"`
 }

-// Wiki
-// swagger:response Wiki
-type swaggerResponseWiki struct {
-	// in:body
-	Body api.WikiResponse `json:"body"`
-}
-
-// WikiList
-// swagger:response WikiList
-type swaggerResponseWikiList struct {
-	// in:body
-	Body api.WikiesResponse `json:"body"`
-}
-
 // Hook
 // swagger:response Hook
 type swaggerResponseHook struct {
@ -128,13 +99,6 @@ type swaggerResponseHookList struct {
 	Body []api.Hook `json:"body"`
 }

-// HookTaskList
-// swagger:response HookTaskList
-type swaggerResponseHookTaskList struct {
-	// in:body
-	Body []api.HookTask `json:"body"`
-}
-
 // GitHook
 // swagger:response GitHook
 type swaggerResponseGitHook struct {
@ -290,28 +254,6 @@ type swaggerCommitList struct {
 	Body []api.Commit `json:"body"`
 }

-// FileCommitList
-// swagger:response FileCommitList
-type swaggerFileCommitList struct {
-	// The current page
-	Page int `json:"X-Page"`
-
-	// Commits per page
-	PerPage int `json:"X-PerPage"`
-
-	// Total commit count
-	Total int `json:"X-Total"`
-
-	// Total number of pages
-	PageCount int `json:"X-PageCount"`
-
-	// True if there is another page
-	HasMore bool `json:"X-HasMore"`
-
-	// in: body
-	Body []api.Commit `json:"body"`
-}
-
 // EmptyRepository
 // swagger:response EmptyRepository
 type swaggerEmptyRepository struct {
--- a/routers/api/v1/utils/hook.go
+++ b/routers/api/v1/utils/hook.go
@ -66,11 +66,6 @@ func CheckCreateHookOption(ctx *context.APIContext, form *api.CreateHookOption)
 		ctx.Error(http.StatusUnprocessableEntity, "", "Invalid content type")
 		return false
 	}
-
-	if !models.IsValidHookHttpMethod(form.Config["http_method"]) {
-		ctx.Error(http.StatusUnprocessableEntity, "", "Invalid http method")
-		return false
-	}
 	return true
 }

@ -106,14 +101,13 @@ func addHook(ctx *context.APIContext, form *api.CreateHookOption, orgID, repoID
 	if len(form.Events) == 0 {
 		form.Events = []string{"push"}
 	}
-
 	w := &models.Webhook{
 		OrgID:       orgID,
 		RepoID:      repoID,
 		URL:         form.Config["url"],
 		ContentType: models.ToHookContentType(form.Config["content_type"]),
 		Secret:      form.Config["secret"],
-		HTTPMethod:  form.Config["http_method"],
+		HTTPMethod:  "POST",
 		HookEvent: &models.HookEvent{
 			ChooseEvents: true,
 			HookEvents: models.HookEvents{
@ -217,9 +211,6 @@ func editHook(ctx *context.APIContext, form *api.EditHookOption, w *models.Webho
 		if url, ok := form.Config["url"]; ok {
 			w.URL = url
 		}
-		if secret, ok := form.Config["secret"]; ok {
-			w.Secret = secret
-		}
 		if ct, ok := form.Config["content_type"]; ok {
 			if !models.IsValidHookContentType(ct) {
 				ctx.Error(http.StatusUnprocessableEntity, "", "Invalid content type")
@ -228,14 +219,6 @@ func editHook(ctx *context.APIContext, form *api.EditHookOption, w *models.Webho
 			w.ContentType = models.ToHookContentType(ct)
 		}

-		if hm, ok := form.Config["http_method"]; ok {
-			if !models.IsValidHookHttpMethod(hm) {
-				ctx.Error(http.StatusUnprocessableEntity, "", "Invalid http method")
-				return false
-			}
-			w.HTTPMethod = hm
-		}
-
 		if w.HookTaskType == models.SLACK {
 			if channel, ok := form.Config["channel"]; ok {
 				meta, err := json.Marshal(&webhook.SlackMeta{
@ -261,25 +244,18 @@ func editHook(ctx *context.APIContext, form *api.EditHookOption, w *models.Webho
 	w.SendEverything = false
 	w.ChooseEvents = true
 	w.Create = com.IsSliceContainsStr(form.Events, string(models.HookEventCreate))
+	w.Push = com.IsSliceContainsStr(form.Events, string(models.HookEventPush))
+	w.PullRequest = com.IsSliceContainsStr(form.Events, string(models.HookEventPullRequest))
+	w.Create = com.IsSliceContainsStr(form.Events, string(models.HookEventCreate))
 	w.Delete = com.IsSliceContainsStr(form.Events, string(models.HookEventDelete))
 	w.Fork = com.IsSliceContainsStr(form.Events, string(models.HookEventFork))
 	w.Issues = com.IsSliceContainsStr(form.Events, string(models.HookEventIssues))
-	w.Issues = issuesHook(form.Events, "issues_only")
-	w.IssueAssign = issuesHook(form.Events, string(models.HookEventIssueAssign))
-	w.IssueLabel = issuesHook(form.Events, string(models.HookEventIssueLabel))
-	w.IssueMilestone = issuesHook(form.Events, string(models.HookEventIssueMilestone))
-	w.IssueComment = issuesHook(form.Events, string(models.HookEventIssueComment))
+	w.IssueComment = com.IsSliceContainsStr(form.Events, string(models.HookEventIssueComment))
 	w.Push = com.IsSliceContainsStr(form.Events, string(models.HookEventPush))
-	w.PullRequest = pullHook(form.Events, "pull_request_only")
-	w.PullRequestAssign = pullHook(form.Events, string(models.HookEventPullRequestAssign))
-	w.PullRequestLabel = pullHook(form.Events, string(models.HookEventPullRequestLabel))
-	w.PullRequestMilestone = pullHook(form.Events, string(models.HookEventPullRequestMilestone))
-	w.PullRequestComment = pullHook(form.Events, string(models.HookEventPullRequestComment))
-	w.PullRequestReview = pullHook(form.Events, "pull_request_review")
-	w.PullRequestSync = pullHook(form.Events, string(models.HookEventPullRequestSync))
+	w.PullRequest = com.IsSliceContainsStr(form.Events, string(models.HookEventPullRequest))
 	w.Repository = com.IsSliceContainsStr(form.Events, string(models.HookEventRepository))
 	w.Release = com.IsSliceContainsStr(form.Events, string(models.HookEventRelease))
-	w.HookEvent.BranchFilter = form.BranchFilter
+	w.BranchFilter = form.BranchFilter

 	if err := w.UpdateEvent(); err != nil {
 		ctx.Error(http.StatusInternalServerError, "UpdateEvent", err)
--- a/routers/api/v1/viewfile/viewfile.go
+++ b/routers/api/v1/viewfile/viewfile.go
@ -2,17 +2,6 @@ package viewfile

 import (
 	"bytes"
-	"encoding/base64"
-	"fmt"
-	gotemplate "html/template"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/charset"
@ -24,21 +13,32 @@ import (
 	"code.gitea.io/gitea/modules/repofiles"
 	repo_module "code.gitea.io/gitea/modules/repository"
 	"code.gitea.io/gitea/modules/setting"
+	"encoding/base64"
+	"fmt"
 	"gitea.com/macaron/macaron"
+	gotemplate "html/template"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"path"
+	"path/filepath"
+	"strconv"
+	"strings"
 )

 func Map2DTO(ctx *context.APIContext) (dto *ReadmeDTO) {
-	dto = &ReadmeDTO{}
-	dto.Type = "file"
-	dto.Encoding = ctx.Data["Encoding"].(string)
-	dto.Size = ctx.Data["FileSize"].(int64)
-	dto.Name = ctx.Repo.TreePath
-	dto.Path = ctx.Repo.TreePath
-	dto.Content = ctx.Data["FileContent"].(string)
-	dto.Sha = ctx.Repo.CommitID
+	dto=&ReadmeDTO{}
+	dto.Type="file"
+	dto.Encoding=ctx.Data["Encoding"].(string)
+	dto.Size=ctx.Data["FileSize"].(int64)
+	dto.Name=ctx.Repo.TreePath
+	dto.Path=ctx.Repo.TreePath
+	dto.Content=ctx.Data["FileContent"].(string)
+	dto.Sha=ctx.Repo.CommitID
 	return
 }

+
 // RepoRefByType handles repository reference name for a specific type
 // of repository reference
 func RepoRefByType(refType context.RepoRefType) macaron.Handler {
@ -162,6 +162,7 @@ func RepoRefByType(refType context.RepoRefType) macaron.Handler {
 	}
 }

+
 func getRefName(ctx *context.APIContext, pathType context.RepoRefType) string {
 	path := ctx.Params("*")
 	switch pathType {
@ -197,7 +198,7 @@ func getRefName(ctx *context.APIContext, pathType context.RepoRefType) string {
 		}
 		return path
 	default:
-		ctx.Error(http.StatusBadRequest, "Unrecognized path type: %v", path)
+		ctx.Error(http.StatusBadRequest,"Unrecognized path type: %v", path)
 	}
 	return ""
 }
@ -217,11 +218,13 @@ func getRefNameFromPath(ctx *context.APIContext, path string, isExist func(strin

 func GetRefType() macaron.Handler {
 	return func(ctx *context.APIContext) {
-		ref := ctx.ParamsInt64(":ref")
-		fmt.Println("ref:", ref)
+		ref:=ctx.ParamsInt64(":ref")
+		fmt.Println("ref:",ref)
 	}
 }

+
+
 func CommitCount(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/count  repository Count
 	// ---
@ -250,6 +253,7 @@ func CommitCount(ctx *context.APIContext) {
 	//   "404":
 	//     "$ref": "#/responses/notFound"

+
 	ref := ctx.QueryTrim("ref")
 	if ref == "" {
 		ref = ctx.Params(":ref")
@ -277,17 +281,18 @@ func CommitCount(ctx *context.APIContext) {
 		}()
 	}

+
 	// Get the commit object for the ref
 	commit, err := ctx.Repo.GitRepo.GetCommit(ref)
-	if err != nil || commit == nil {
-		ctx.Error(http.StatusInternalServerError, "ctx.Repo.GitRepo.GetCommit", err)
+	if err != nil || commit==nil{
+		ctx.Error(http.StatusInternalServerError,"ctx.Repo.GitRepo.GetCommit", err)
 		return
 	}
-	ctx.Repo.Commit = commit
+	ctx.Repo.Commit=commit

-	CommitCount, err := ctx.Repo.Commit.CommitsCount()
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "ctx.Repo.Commit.CommitsCount", err)
+	CommitCount,err:=ctx.Repo.Commit.CommitsCount()
+	if err !=nil {
+		ctx.Error(http.StatusInternalServerError,"ctx.Repo.Commit.CommitsCount", err)
 		return
 	}
 	opts := models.FindReleasesOptions{
@ -311,28 +316,29 @@ func CommitCount(ctx *context.APIContext) {
 		return
 	}

-	tags, err := ctx.Repo.GitRepo.GetTags()
+	tags,err:=ctx.Repo.GitRepo.GetTags()
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "ctx.Repo.GitRepo.GetTags", err)
 		return
 	}

-	dto := &CountDTO{}
-	dto.Branch.CommitCount = CommitCount
-	dto.Branch.BranchName = ref
-	dto.BranchCount = int64(len(branches))
-	dto.TagCount = int64(len(tags))
-	dto.ReleaseCount = ReleaseCount
+	dto:=&CountDTO{}
+	dto.Branch.CommitCount=CommitCount
+	dto.Branch.BranchName=ref
+	dto.BranchCount=int64(len(branches))
+	dto.TagCount=int64(len(tags))
+	dto.ReleaseCount=ReleaseCount
 	ctx.JSON(http.StatusOK, dto)
 }

+
 type CountDTO struct {
-	Branch struct {
-		CommitCount int64  `json:"commit_count"`
-		BranchName  string `json:"branch_name"`
+	Branch  struct{
+		CommitCount int64 `json:"commit_count"`
+		BranchName  string  `json:"branch_name"`
 	} `json:"branch"`
-	ReleaseCount int64 `json:"release_count"`
-	TagCount     int64 `json:"tag_count"`
+	ReleaseCount int64  `json:"release_count"`
+	TagCount int64   `json:"tag_count"`
 	BranchCount  int64 `json:"branch_count"`
 }

@ -377,6 +383,7 @@ func LatestRelease(ctx *context.APIContext) {
 		}()
 	}

+
 	release, err := models.GetLatestReleaseByRepoIDExt(ctx.Repo.Repository.ID)
 	//fmt.Println("****************ctx.Repo.Repository.ID:",ctx.Repo.Repository.ID," ",release," ",err)
 	if err != nil {
@ -393,10 +400,11 @@ func LatestRelease(ctx *context.APIContext) {
 		return
 	}

-	release.Publisher.Passwd = ""
+	release.Publisher.Passwd=""
 	ctx.JSON(http.StatusOK, release)
 }

+
 func Readme(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/readme  repository readme
 	// ---
@ -425,29 +433,29 @@ func Readme(ctx *context.APIContext) {
 	//   "404":
 	//     "$ref": "#/responses/notFound"

-	ctx.Data["Encoding"] = "base64"
+	ctx.Data["Encoding"]="base64"
 	treePath := ctx.Repo.TreePath

-	ref := ctx.QueryTrim("ref")
+	ref:= ctx.QueryTrim("ref")
 	if ref == "" {
-		ref = ctx.Params(":ref")
-		if ref == "" {
+		ref= ctx.Params(":ref")
+		if ref=="" {
 			ref = ctx.Repo.Repository.DefaultBranch
 		}
 	}
-	fmt.Println("***ref:", ref)
+	fmt.Println("***ref:",ref)

-	namedBlob, err := getReadmeFileFromPathExt(ctx, treePath, ref)
-	if err != nil || namedBlob == nil {
-		ctx.NotFound("getReadmeFileFromPath", err)
+	namedBlob,err:=getReadmeFileFromPathExt(ctx,treePath,ref)
+    if err !=nil || namedBlob==nil{
+		ctx.NotFound("getReadmeFileFromPath",  err)
 		return
 	}
 	//fmt.Println("********getReadmeFileFromPathExt:",err," ",namedBlob)
-	FoundFileItem := namedBlob.name
-	ctx.Repo.TreePath = FoundFileItem //找到指定文件;
+ 	FoundFileItem:=namedBlob.name
+	ctx.Repo.TreePath=FoundFileItem  //找到指定文件;

 	//fmt.Println("**** reqRepoReader(models.UnitTypeCode):",FoundFileItem)
-	ctx.Data["PageIsViewCode"] = true
+ 	ctx.Data["PageIsViewCode"] = true
 	if ctx.Repo.Repository.IsEmpty {
 		ctx.NotFound("Home", fmt.Errorf(ctx.Tr("Repository is empty")))
 		return
@ -459,9 +467,9 @@ func Readme(ctx *context.APIContext) {
 	}
 	ctx.Data["Title"] = title

-	ctx.Repo.RepoLink = `/` + ctx.Repo.Owner.Name + `/` + ctx.Repo.Repository.Name
+	ctx.Repo.RepoLink=`/`+ctx.Repo.Owner.Name+`/`+ctx.Repo.Repository.Name

-	ctx.Repo.IsViewCommit = true //此处无实际意义;加上为了编译
+	ctx.Repo.IsViewCommit=true //此处无实际意义;加上为了编译

 	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
 	treeLink := branchLink
@ -469,21 +477,21 @@ func Readme(ctx *context.APIContext) {
 	//fmt.Println("******rawLink:",rawLink)
 	if len(ctx.Repo.TreePath) > 0 {
 		treeLink += "/" + ctx.Repo.TreePath
-		treeLink = strings.ReplaceAll(treeLink, "//", "/")
+		treeLink=strings.ReplaceAll(treeLink,"//","/")
 	}

 	// Get current entry user currently looking at.
 	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)
 	//fmt.Println("*********GetTreeEntryByPath:",entry," ",err)
-	if err != nil {
-		ctx.NotFound("Repo.Commit.GetTreeEntryByPath", err)
+	if err != nil  {
+		ctx.NotFound("Repo.Commit.GetTreeEntryByPath",  err)
 		return
 	}
-	if entry == nil {
-		ctx.NotFound("Repo.Commit.GetTreeEntryByPath", err)
+	if entry==nil {
+		ctx.NotFound("Repo.Commit.GetTreeEntryByPath",  err)
 		return
 	}
-	renderFile(ctx, entry, treeLink, rawLink)
+ 	renderFile(ctx, entry, treeLink, rawLink)
 	//if ctx.Written() {
 	//	return
 	//}
@ -492,10 +500,10 @@ func Readme(ctx *context.APIContext) {
 	paths := make([]string, 0, 5)
 	if len(ctx.Repo.TreePath) > 0 {
 		treeNames = strings.Split(ctx.Repo.TreePath, "/")
-		fmt.Println("***treeNames:", treeNames)
+		fmt.Println("***treeNames:",treeNames)
 		for i := range treeNames {
 			paths = append(paths, strings.Join(treeNames[:i+1], "/"))
-			fmt.Println("***paths:", paths)
+			fmt.Println("***paths:",paths)

 		}
 		ctx.Data["HasParentPath"] = true
@ -504,107 +512,36 @@ func Readme(ctx *context.APIContext) {
 		}
 	}

+
 	ctx.Data["Paths"] = paths
 	ctx.Data["TreeLink"] = treeLink
 	ctx.Data["TreeNames"] = treeNames
 	ctx.Data["BranchLink"] = branchLink

-	fmt.Println("***rawLink:", rawLink)
-	fmt.Println("***paths:", paths)
-	fmt.Println("***treeLink:", treeLink)
-	fmt.Println("***treeNames:", treeNames)
-	fmt.Println("***branchLink:", branchLink)
+	fmt.Println("***rawLink:",rawLink)
+	fmt.Println("***paths:",paths)
+	fmt.Println("***treeLink:",treeLink)
+	fmt.Println("***treeNames:",treeNames)
+	fmt.Println("***branchLink:",branchLink)

 	ctx.JSON(http.StatusOK, Map2DTO(ctx))

 }

-/////////////
-func ReadmeByPath(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/readme/{dir}  repository readmePathContents
-	// ---
-	// summary: Gets the metadata and contents (if a file) of an entry in a repository, or a list of entries if a dir
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: dir
-	//   in: path
-	//   description: name of the path
-	//   type: string
-	//   required: true
-	// - name: ref
-	//   in: query
-	//   description: "The name of the commit/branch/tag. Default the repository’s default branch (usually master)"
-	//   type: string
-	//   required: false
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/ContentsResponse"
-	//   "404":
-	//     "$ref": "#/responses/notFound"
-
-	treePath := ctx.Params("*")
-	ref := ctx.QueryTrim("ref")
-	if ref == "" {
-		ref = ctx.Params(":ref")
-		if ref == "" {
-			ref = ctx.Repo.Repository.DefaultBranch
-		}
-	}
-	namedBlob, err := getReadmeFileFromPathExt(ctx, treePath, ref)
-	if err != nil || namedBlob == nil {
-		// ctx.NotFound("getReadmeFileFromPath", err)
-		fileList, err1 := repofiles.GetContentsOrList(ctx.Repo.Repository, treePath, ref)
-		if err1 != nil {
-			if git.IsErrNotExist(err1) {
-				ctx.NotFound("fileList", err1)
-				return
-			}
-			ctx.Error(http.StatusInternalServerError, "GetFileListByPath", err)
-		} else {
-			ctx.JSON(http.StatusOK, fileList)
-		}
-	} else {
-		FoundFileItem := namedBlob.name
-		newTreePath := treePath + "/" + FoundFileItem
-
-		contents, err2 := repofiles.GetContents(ctx.Repo.Repository, newTreePath, ref, false)
-		if err2 != nil {
-			if git.IsErrNotExist(err2) {
-				ctx.NotFound("GetReadmeContentByPath", err2)
-				return
-			}
-			ctx.Error(http.StatusInternalServerError, "GetReadmeContentByPath", err)
-		} else {
-			ctx.JSON(http.StatusOK, contents)
-		}
-	}
-
-}

 func ViewFile(ctx *context.APIContext) {
-	ctx.Data["Encoding"] = "base64"
+	ctx.Data["Encoding"]="base64"

-	fmt.Println("*********viewFile.ctx.Repo.TreePath:", ctx.Repo.TreePath)
-	namedBlob, err := getReadmeFileFromPath(ctx.Repo.Commit, ctx.Repo.TreePath)
-	if err != nil || namedBlob == nil {
-		ctx.NotFound("getReadmeFileFromPath", err)
+	fmt.Println("*********viewFile.ctx.Repo.TreePath:",ctx.Repo.TreePath)
+	namedBlob,err:=getReadmeFileFromPath(ctx.Repo.Commit,ctx.Repo.TreePath)
+	if err !=nil || namedBlob==nil{
+		ctx.NotFound("getReadmeFileFromPath",  err)
 		return
 	}
-	FoundFileItem := namedBlob.name
-	ctx.Repo.TreePath = FoundFileItem //找到指定文件;
+	FoundFileItem:=namedBlob.name
+	ctx.Repo.TreePath=FoundFileItem  //找到指定文件;

-	fmt.Println("****getReadmeFileFromPath:", FoundFileItem)
+	fmt.Println("****getReadmeFileFromPath:",FoundFileItem)
 	ctx.Data["PageIsViewCode"] = true
 	if ctx.Repo.Repository.IsEmpty {
 		ctx.NotFound("Home", fmt.Errorf(ctx.Tr("Repository is empty")))
@ -617,7 +554,7 @@ func ViewFile(ctx *context.APIContext) {
 	}
 	ctx.Data["Title"] = title

-	ctx.Repo.RepoLink = `/` + ctx.Repo.Owner.Name + `/` + ctx.Repo.Repository.Name
+	ctx.Repo.RepoLink=`/`+ctx.Repo.Owner.Name+`/`+ctx.Repo.Repository.Name

 	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
 	//fmt.Println("******branchLink:",branchLink)
@ -639,13 +576,13 @@ func ViewFile(ctx *context.APIContext) {

 	// Get current entry user currently looking at.
 	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)
-	fmt.Println("*********GetTreeEntryByPath:", entry, " ", err)
-	if err != nil {
-		ctx.NotFound("Repo.Commit.GetTreeEntryByPath", err)
+	fmt.Println("*********GetTreeEntryByPath:",entry," ",err)
+	if err != nil  {
+		ctx.NotFound("Repo.Commit.GetTreeEntryByPath",  err)
 		return
 	}
-	if entry == nil {
-		ctx.NotFound("Repo.Commit.GetTreeEntryByPath", err)
+	if entry==nil {
+		ctx.NotFound("Repo.Commit.GetTreeEntryByPath",  err)
 		return
 	}
 	renderFile(ctx, entry, treeLink, rawLink)
@ -657,10 +594,10 @@ func ViewFile(ctx *context.APIContext) {
 	paths := make([]string, 0, 5)
 	if len(ctx.Repo.TreePath) > 0 {
 		treeNames = strings.Split(ctx.Repo.TreePath, "/")
-		fmt.Println("***treeNames:", treeNames)
+		fmt.Println("***treeNames:",treeNames)
 		for i := range treeNames {
 			paths = append(paths, strings.Join(treeNames[:i+1], "/"))
-			fmt.Println("***paths:", paths)
+			fmt.Println("***paths:",paths)

 		}
 		ctx.Data["HasParentPath"] = true
@ -669,16 +606,17 @@ func ViewFile(ctx *context.APIContext) {
 		}
 	}

+
 	ctx.Data["Paths"] = paths
 	ctx.Data["TreeLink"] = treeLink
 	ctx.Data["TreeNames"] = treeNames
 	ctx.Data["BranchLink"] = branchLink

-	fmt.Println("***rawLink:", rawLink)
-	fmt.Println("***paths:", paths)
-	fmt.Println("***treeLink:", treeLink)
-	fmt.Println("***treeNames:", treeNames)
-	fmt.Println("***branchLink:", branchLink)
+	fmt.Println("***rawLink:",rawLink)
+	fmt.Println("***paths:",paths)
+	fmt.Println("***treeLink:",treeLink)
+	fmt.Println("***treeNames:",treeNames)
+	fmt.Println("***branchLink:",branchLink)

 	ctx.JSON(http.StatusOK, Map2DTO(ctx))

@ -689,7 +627,7 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 	blob := entry.Blob()
 	dataRc, err := blob.DataAsync()
 	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "DataAsync", err)
+		ctx.Error(http.StatusInternalServerError,"DataAsync", err)
 		return
 	}
 	defer dataRc.Close()
@ -702,9 +640,9 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 	ctx.Data["FileName"] = blob.Name()
 	ctx.Data["RawFileLink"] = rawLink + "/" + ctx.Repo.TreePath

-	Base64Encoding := base64.StdEncoding
-	if ctx.Data["Encoding"] == "base64url" {
-		Base64Encoding = base64.RawURLEncoding
+	Base64Encoding:=base64.StdEncoding
+    if  ctx.Data["Encoding"]=="base64url" {
+		Base64Encoding=base64.RawURLEncoding
 	}
 	buf := make([]byte, 1024)
 	n, _ := dataRc.Read(buf)
@ -719,11 +657,11 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 		if meta != nil {
 			meta, err = ctx.Repo.Repository.GetLFSMetaObjectByOid(meta.Oid)
 			if err != nil && err != models.ErrLFSObjectNotExist {
-				ctx.Error(http.StatusInternalServerError, "GetLFSMetaObject", err)
+				ctx.Error(http.StatusInternalServerError,"GetLFSMetaObject", err)
 				return
 			}
 		}
-		fmt.Println("***setting.LFS.StartServer:", meta)
+		fmt.Println("***setting.LFS.StartServer:",meta)
 		if meta != nil {
 			ctx.Data["IsLFSFile"] = true
 			isLFSFile = true
@ -732,7 +670,7 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 			var err error
 			dataRc, err = lfs.ReadMetaObject(meta)
 			if err != nil {
-				ctx.Error(http.StatusInternalServerError, "ReadMetaObject", err)
+				ctx.Error(http.StatusInternalServerError,"ReadMetaObject", err)
 				return
 			}
 			defer dataRc.Close()
@ -740,7 +678,7 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 			buf = make([]byte, 1024)
 			n, err = dataRc.Read(buf)
 			if err != nil {
-				ctx.Error(http.StatusInternalServerError, "Data", err)
+				ctx.Error(http.StatusInternalServerError,"Data", err)
 				return
 			}
 			buf = buf[:n]
@ -758,7 +696,7 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 	lfsLock, err := ctx.Repo.Repository.GetTreePathLock(ctx.Repo.TreePath)
 	ctx.Data["LFSLock"] = lfsLock
 	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetTreePathLock", err)
+		ctx.Error(http.StatusInternalServerError,"GetTreePathLock", err)
 		return
 	}
 	if lfsLock != nil {
@ -789,7 +727,7 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 			ctx.Data["MarkupType"] = markupType
 			//ctx.Data["FileContent"] = string(markup.Render(blob.Name(), buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeDocumentMetas()))
 			filenameBase64 := Base64Encoding.EncodeToString(buf)
-			ctx.Data["FileContent"] = filenameBase64
+			 ctx.Data["FileContent"] =filenameBase64
 			//fmt.Println("************FileContent1:",ctx.Data["FileContent"].(string))
 		} else if readmeExist {
 			ctx.Data["IsRenderedHTML"] = true
@ -804,7 +742,7 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 			//ctx.Data["FileContent"] = highlight.File(lineNums, blob.Name(), buf)

 			filenameBase64 := Base64Encoding.EncodeToString(buf)
-			ctx.Data["FileContent"] = filenameBase64
+			ctx.Data["FileContent"] =filenameBase64
 			//fmt.Println("************FileContent2:",ctx.Data["FileContent"].(string))
 		}
 		if !isLFSFile {
@ -845,12 +783,12 @@ func renderFile(ctx *context.APIContext, entry *git.TreeEntry, treeLink, rawLink
 			//ctx.Data["FileContent"] = string(markup.Render(blob.Name(), buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeDocumentMetas()))

 			filenameBase64 := Base64Encoding.EncodeToString(buf)
-			ctx.Data["FileContent"] = filenameBase64
-			fmt.Println("************FileContent3:", ctx.Data["FileContent"].(string))
+			ctx.Data["FileContent"] =filenameBase64
+			fmt.Println("************FileContent3:",ctx.Data["FileContent"].(string))
 		}

 	}
-}
+ }
 func safeURL(address string) string {
 	u, err := url.Parse(address)
 	if err != nil {
@ -860,6 +798,7 @@ func safeURL(address string) string {
 	return u.String()
 }

+
 func linesBytesCount(s []byte) int {
 	nl := []byte{'\n'}
 	n := bytes.Count(s, nl)
@ -881,6 +820,7 @@ func linesBytesCount(s []byte) int {
 }
 */

+
 // FIXME: There has to be a more efficient way of doing this
 func getReadmeFileFromPath(commit *git.Commit, treePath string) (*namedBlob, error) {

@ -957,13 +897,13 @@ func getReadmeFileFromPath(commit *git.Commit, treePath string) (*namedBlob, err
 // FIXME: There has to be a more efficient way of doing this
 func getReadmeFileFromPathExt(ctx *context.APIContext, treePath, ref string) (*namedBlob, error) {
 	log.Info("*****************getReadmeFileFromPathExt.GetCommit:ref:%s treepath:%s", ref, treePath)
-	var err error
+    var err error
 	if ctx.Repo.GitRepo == nil {
 		repoPath := models.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
 		ctx.Repo.GitRepo, err = git.OpenRepository(repoPath)
 		if err != nil {
 			ctx.ServerError("RepoRef Invalid repo "+repoPath, err)
-			return nil, err
+			return nil,err
 		}
 		// We opened it, we should close it
 		defer func() {
@ -974,6 +914,7 @@ func getReadmeFileFromPathExt(ctx *context.APIContext, treePath, ref string) (*n
 		}()
 	}

+
 	// Get the commit object for the ref
 	commit, err := ctx.Repo.GitRepo.GetCommit(ref)
 	if err != nil {
@ -981,7 +922,7 @@ func getReadmeFileFromPathExt(ctx *context.APIContext, treePath, ref string) (*n
 	}
 	//log.Info("********GetCommit:%v",commit)

-	ctx.Repo.Commit = commit
+	ctx.Repo.Commit=commit

 	tree, err := commit.SubTree(treePath)
 	if err != nil {
@ -1054,6 +995,7 @@ func getReadmeFileFromPathExt(ctx *context.APIContext, treePath, ref string) (*n
 	return readmeFile, nil
 }

+
 func FindFiles(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/find  repository find
 	// ---
@ -1088,23 +1030,23 @@ func FindFiles(ctx *context.APIContext) {
 	//     "$ref": "#/responses/notFound"

 	treePath := ctx.Repo.TreePath
-	ref := ctx.QueryTrim("ref")
+	ref:= ctx.QueryTrim("ref")
 	if ref == "" {
 		ref = ctx.Repo.Repository.DefaultBranch
 	}
-	fmt.Println("***ref:", ref)
-	keyword := ctx.QueryTrim("q")
+	fmt.Println("***ref:",ref)
+	keyword:= ctx.QueryTrim("q")
 	if keyword == "" {
 		//keyword="README"  //test
 	}

-	FindList, err := FindFileFromPathExt(ctx, treePath, ref, keyword)
-	if err != nil {
-		ctx.NotFound("FindFiles", err)
+	FindList,err:=FindFileFromPathExt(ctx,treePath,ref,keyword)
+	if err !=nil {
+		ctx.NotFound("FindFiles",  err)
 		return
 	}

-	ctx.JSON(http.StatusOK, FindList)
+   ctx.JSON(http.StatusOK,FindList)
 }

 // TO DO
@ -1114,7 +1056,7 @@ func FindFileFromPathExt(ctx *context.APIContext, treePath, ref, key string) (fi
 		ctx.Repo.GitRepo, err = git.OpenRepository(repoPath)
 		if err != nil {
 			ctx.ServerError("RepoRef Invalid repo "+repoPath, err)
-			return nil, err
+			return nil,err
 		}
 		// We opened it, we should close it
 		defer func() {
@ -1125,12 +1067,14 @@ func FindFileFromPathExt(ctx *context.APIContext, treePath, ref, key string) (fi
 		}()
 	}

+
 	// Get the commit object for the ref
 	commit, err := ctx.Repo.GitRepo.GetCommit(ref)
 	if err != nil {
 		return nil, err
 	}

+
 	tree, err := commit.SubTree(treePath)
 	if err != nil {
 		return nil, err
@ -1145,20 +1089,21 @@ func FindFileFromPathExt(ctx *context.APIContext, treePath, ref, key string) (fi
 		return nil, err
 	}

-	fileList = make([]*SearchFileItem, 0, 0)
+	fileList =make([]*SearchFileItem,0,0)

 	for _, entry := range entries {
 		if entry.IsDir() {
 			continue
 		}

-		fileName := filepath.Base(entry.Name())

-		if strings.Contains(strings.ToLower(fileName), strings.ToLower(key)) || key == "" {
+		fileName:=filepath.Base(entry.Name())
+
+		if strings.Contains(strings.ToLower(fileName),strings.ToLower(key)) || key=="" {
 			name := entry.Name()
 			//isSymlink := entry.IsLink()
 			//target := entry
-			//_=target
+            //_=target
 			//
 			//if isSymlink {
 			//	target, err = entry.FollowLinks()
@ -1166,7 +1111,7 @@ func FindFileFromPathExt(ctx *context.APIContext, treePath, ref, key string) (fi
 			//		return nil, err
 			//	}
 			//}
-			treePath = name
+			treePath=name
 			selfURL, err := url.Parse(fmt.Sprintf("%s/contents/%s?ref=%s", ctx.Repo.Repository.APIURL(), treePath, ref))
 			if err != nil {
 				return nil, err
@ -1184,14 +1129,15 @@ func FindFileFromPathExt(ctx *context.APIContext, treePath, ref, key string) (fi
 			}
 			htmlURLString := htmlURL.String()

+
 			Item := &SearchFileItem{
-				Name:    fileName,
-				Path:    treePath,
-				SHA:     entry.ID.String(),
-				Type:    entry.Type(),
-				Size:    entry.Size(),
-				URL:     &selfURLString,
-				HTMLURL: &htmlURLString,
+				Name:fileName,
+				Path:treePath,
+				SHA:entry.ID.String(),
+				Type:entry.Type(),
+				Size:entry.Size(),
+				URL:&selfURLString,
+				HTMLURL:&htmlURLString,
 			}

 			// Now populate the rest of the ContentsResponse based on entry type
@ -1206,28 +1152,29 @@ func FindFileFromPathExt(ctx *context.APIContext, treePath, ref, key string) (fi
 			} else if entry.IsSubModule() {
 				Item.Type = string(repofiles.ContentTypeSubmodule)
 			}
-			fileList = append(fileList, Item)
+			fileList=append(fileList,Item)
 		}

 	}
 	return
 }

+
 type SearchFileItem struct {
 	Name string `json:"name"`
 	Path string `json:"path"`
 	SHA  string `json:"sha"`
 	// `type` will be `file`, `dir`, `symlink`, or `submodule`
-	Type    string  `json:"type"`
-	Size    int64   `json:"size"`
-	URL     *string `json:"url"`
-	HTMLURL *string `json:"html_url"`
-	//	GitURL      *string `json:"git_url"`
-	//	DownloadURL *string `json:"download_url"`
-	//	// `submodule_git_url` is populated when `type` is `submodule`, otherwise null
-	//	SubmoduleGitURL *string            `json:"submodule_git_url"`
-	//	Links           *api.FileLinksResponse `json:"_links"`
-}
+	Type string `json:"type"`
+	Size int64  `json:"size"`
+	URL         *string `json:"url"`
+	HTMLURL     *string `json:"html_url"`
+//	GitURL      *string `json:"git_url"`
+//	DownloadURL *string `json:"download_url"`
+//	// `submodule_git_url` is populated when `type` is `submodule`, otherwise null
+//	SubmoduleGitURL *string            `json:"submodule_git_url"`
+//	Links           *api.FileLinksResponse `json:"_links"`
+ }

 func IsReadmeFileExt(name string, ext ...string) bool {
 	name = strings.ToLower(name)
@ -1242,6 +1189,7 @@ func IsReadmeFileExt(name string, ext ...string) bool {
 	return name[:7] == "readme_zh."
 }

+
 type namedBlob struct {
 	name      string
 	isSymlink bool
@ -1249,13 +1197,13 @@ type namedBlob struct {
 }

 type ReadmeDTO struct {
-	Type     string `json:"type"`
-	Encoding string `json:"encoding"`
-	Size     int64  `json:"size"`
-	Name     string `json:"name"`
-	Path     string `json:"path"`
-	Content  string `json:"content"`
-	Sha      string `json:"sha"`
+	Type        string `json:"type"`
+	Encoding    string `json:"encoding"`
+	Size        int64    `json:"size"`
+	Name        string `json:"name"`
+	Path        string `json:"path"`
+	Content     string `json:"content"`
+	Sha         string `json:"sha"`
 	//URL         string `json:"url"`
 	//GitURL      string `json:"git_url"`
 	//HTMLURL     string `json:"html_url"`
@ -1268,7 +1216,7 @@ type ReadmeDTO struct {
 }

 type ReadmeResponeDTO struct {
-	Msg       string
-	Code      int
+	Msg string
+	Code int
 	ReadmeDTO *ReadmeDTO
 }
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@ -179,7 +179,7 @@ func FileHistory(ctx *context.Context) {
 		page = 1
 	}

-	commits, err := ctx.Repo.GitRepo.CommitsByFileAndRange(branchName, fileName, page, 50)
+	commits, err := ctx.Repo.GitRepo.CommitsByFileAndRange(branchName, fileName, page)
 	if err != nil {
 		ctx.ServerError("CommitsByFileAndRange", err)
 		return
--- a/routers/repo/wiki.go
+++ b/routers/repo/wiki.go
@ -277,7 +277,7 @@ func renderRevisionPage(ctx *context.Context) (*git.Repository, *git.TreeEntry)
 	}

 	// get Commit Count
-	commitsHistory, err := wikiRepo.CommitsByFileAndRangeNoFollow("master", pageFilename, page, 50)
+	commitsHistory, err := wikiRepo.CommitsByFileAndRangeNoFollow("master", pageFilename, page)
 	if err != nil {
 		if wikiRepo != nil {
 			wikiRepo.Close()
--- a/services/wiki/wiki.go
+++ b/services/wiki/wiki.go
@ -6,7 +6,6 @@
 package wiki

 import (
-	"errors"
 	"fmt"
 	"net/url"
 	"os"
@ -66,16 +65,6 @@ func FilenameToName(filename string) (string, error) {
 	}
 	return NormalizeWikiName(unescaped), nil
 }
-// check filename
-func CheckFile(filename string) error {
-	if(len(filename) <= 150 ){
-		return nil
-	}else {
-		err := errors.New("The name is too long, please be less than 200 bytes")
-		return err
-	}
-}
-

 // InitWiki initializes a wiki for repository,
 // it does nothing when repository already has wiki.
@ -145,10 +134,6 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new
 	}

 	newWikiPath := NameToFilename(newWikiName)
-
-	//进行url解码
-	//newWikiPath, _ = url.QueryUnescape(newWikiPath)
-
 	if isNew {
 		filesInIndex, err := gitRepo.LsFiles(newWikiPath)
 		if err != nil {
@ -185,8 +170,6 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new
 		return err
 	}

-	fmt.Println("newWikiPath======================",newWikiPath)
-
 	if err := gitRepo.AddObjectToIndex("100644", objectHash, newWikiPath); err != nil {
 		log.Error("%v", err)
 		return err
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@ -2443,39 +2443,6 @@
        }
      }
    },
-    "/repos/{owner}/{repo}/branches/branches_slice": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "List a repository's branches, Group sort.",
-        "operationId": "repoListBranchesSlice",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/BranchList"
-          }
-        }
-      }
-    },
    "/repos/{owner}/{repo}/branches/{branch}": {
      "get": {
        "produces": [
@ -2843,63 +2810,6 @@
        }
      }
    },
-    "/repos/{owner}/{repo}/commits_slice": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Get a list of all commits from a repository",
-        "operationId": "repoGetAllCommitsSlice",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "SHA or branch to start listing commits from (usually 'master')",
-            "name": "sha",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "description": "page number of results to return (1-based)",
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "description": "page size of results",
-            "name": "limit",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/CommitList"
-          },
-          "404": {
-            "$ref": "#/responses/notFound"
-          },
-          "409": {
-            "$ref": "#/responses/EmptyRepository"
-          }
-        }
-      }
-    },
    "/repos/{owner}/{repo}/contents": {
      "get": {
        "produces": [
@ -3286,70 +3196,6 @@
        }
      }
    },
-    "/repos/{owner}/{repo}/file_commits/{filepath}": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Get a list of all commits by filepath from a repository",
-        "operationId": "repoGetFileAllCommits",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "filepath of the file to get",
-            "name": "filepath",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "SHA or branch to start listing commits from (usually 'master')",
-            "name": "sha",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "description": "page number of results to return (1-based)",
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "description": "page size of results",
-            "name": "limit",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/FileCommitList"
-          },
-          "404": {
-            "$ref": "#/responses/notFound"
-          },
-          "409": {
-            "$ref": "#/responses/EmptyRepository"
-          }
-        }
-      }
-    },
    "/repos/{owner}/{repo}/find": {
      "get": {
        "produces": [
@ -4142,59 +3988,6 @@
        }
      }
    },
-    "/repos/{owner}/{repo}/hooks/{id}/hooktasks": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Get a hooktasks",
-        "operationId": "repoGetHookTasks",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "id of the hook",
-            "name": "id",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "integer",
-            "description": "page number of results to return (1-based)",
-            "name": "page",
-            "in": "query"
-          },
-          {
-            "type": "integer",
-            "description": "page size of results",
-            "name": "limit",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/HookTaskList"
-          }
-        }
-      }
-    },
    "/repos/{owner}/{repo}/hooks/{id}/tests": {
      "post": {
        "produces": [
@ -7763,12 +7556,6 @@
            "name": "filepath",
            "in": "path",
            "required": true
-          },
-          {
-            "type": "string",
-            "description": "The name of the commit/branch/tag. Default the repository’s default branch (usually master)",
-            "name": "ref",
-            "in": "query"
          }
        ],
        "responses": {
@ -7823,55 +7610,6 @@
        }
      }
    },
-    "/repos/{owner}/{repo}/readme/{dir}": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Gets the metadata and contents (if a file) of an entry in a repository, or a list of entries if a dir",
-        "operationId": "readmePathContents",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the path",
-            "name": "dir",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "The name of the commit/branch/tag. Default the repository’s default branch (usually master)",
-            "name": "ref",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/ContentsResponse"
-          },
-          "404": {
-            "$ref": "#/responses/notFound"
-          }
-        }
-      }
-    },
    "/repos/{owner}/{repo}/releases": {
      "get": {
        "produces": [
@ -9109,203 +8847,6 @@
        }
      }
    },
-    "/repos/{owner}/{repo}/wikies": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "List the wikies in a repository",
-        "operationId": "repoWikiList",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/WikiList"
-          }
-        }
-      },
-      "post": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Create a wiki in a repository",
-        "operationId": "repoCreateWiki",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/WikiOption"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/Wiki"
-          }
-        }
-      }
-    },
-    "/repos/{owner}/{repo}/wikies/{pagename}": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Get a Wiki",
-        "operationId": "repoGetWiki",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the wikipage",
-            "name": "pagename",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/Wiki"
-          }
-        }
-      },
-      "delete": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Delete a wiki in a repository",
-        "operationId": "repoDeleteWiki",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the wiki",
-            "name": "pagename",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "204": {
-            "$ref": "#/responses/empty"
-          },
-          "500": {
-            "$ref": "#/responses/noFound"
-          }
-        }
-      },
-      "patch": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Edit a wiki in a repository",
-        "operationId": "repoEditWiki",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the wiki",
-            "name": "pagename",
-            "in": "path",
-            "required": true
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "schema": {
-              "$ref": "#/definitions/WikiOption"
-            }
-          }
-        ],
-        "responses": {
-          "201": {
-            "$ref": "#/responses/Wiki"
-          }
-        }
-      }
-    },
    "/repositories/{id}": {
      "get": {
        "produces": [
@ -11512,26 +11053,9 @@
      "description": "Branch represents a repository branch",
      "type": "object",
      "properties": {
-        "branch_kind": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "BranchKind"
-        },
        "commit": {
          "$ref": "#/definitions/PayloadCommit"
        },
-        "commit_id": {
-          "type": "string",
-          "x-go-name": "CommitID"
-        },
-        "commit_time": {
-          "type": "string",
-          "x-go-name": "CommitTime"
-        },
-        "default_branch": {
-          "type": "string",
-          "x-go-name": "DefaultBranch"
-        },
        "effective_branch_protection_name": {
          "type": "string",
          "x-go-name": "EffectiveBranchProtectionName"
@ -11690,20 +11214,6 @@
      },
      "x-go-package": "code.gitea.io/gitea/modules/structs"
    },
-    "CloneLink": {
-      "type": "object",
-      "properties": {
-        "https": {
-          "type": "string",
-          "x-go-name": "HTTPS"
-        },
-        "ssh": {
-          "type": "string",
-          "x-go-name": "SSH"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
    "Comment": {
      "description": "Comment represents a comment on a commit or issue",
      "type": "object",
@ -11756,21 +11266,14 @@
    },
    "Commit": {
      "type": "object",
+      "title": "Commit contains information generated from a Git commit.",
      "properties": {
        "author": {
          "$ref": "#/definitions/User"
        },
-        "branch": {
-          "type": "string",
-          "x-go-name": "Branch"
-        },
        "commit": {
          "$ref": "#/definitions/RepoCommit"
        },
-        "commit_date": {
-          "type": "string",
-          "x-go-name": "CommitDate"
-        },
        "committer": {
          "$ref": "#/definitions/User"
        },
@ -13845,10 +13348,6 @@
          "type": "boolean",
          "x-go-name": "Active"
        },
-        "branch_filter": {
-          "type": "string",
-          "x-go-name": "BranchFilter"
-        },
        "config": {
          "type": "object",
          "additionalProperties": {
@ -13885,74 +13384,6 @@
      },
      "x-go-package": "code.gitea.io/gitea/modules/structs"
    },
-    "HookTask": {
-      "type": "object",
-      "properties": {
-        "config": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "x-go-name": "Config"
-        },
-        "delivered": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "Delivered"
-        },
-        "event_type": {
-          "type": "string",
-          "x-go-name": "EventType"
-        },
-        "id": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "ID"
-        },
-        "is_delivered": {
-          "type": "boolean",
-          "x-go-name": "IsDelivered"
-        },
-        "is_ssl": {
-          "type": "boolean",
-          "x-go-name": "IsSSL"
-        },
-        "is_succeed": {
-          "type": "boolean",
-          "x-go-name": "IsSucceed"
-        },
-        "payload_content": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "object"
-          },
-          "x-go-name": "PayloadContent"
-        },
-        "request_info": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "object"
-          },
-          "x-go-name": "RequestContent"
-        },
-        "response_content": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "object"
-          },
-          "x-go-name": "ResponseContent"
-        },
-        "type": {
-          "type": "string",
-          "x-go-name": "Type"
-        },
-        "uuid": {
-          "type": "string",
-          "x-go-name": "UUID"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
    "Identity": {
      "description": "Identity for a person's identity like an author or committer",
      "type": "object",
@ -15006,10 +14437,6 @@
          "format": "date-time",
          "x-go-name": "PublishedAt"
        },
-        "sha": {
-          "type": "string",
-          "x-go-name": "Sha1"
-        },
        "tag_name": {
          "type": "string",
          "x-go-name": "TagName"
@ -15395,23 +14822,16 @@
      "type": "object",
      "properties": {
        "commit": {
-          "$ref": "#/definitions/TagCommit"
+          "$ref": "#/definitions/CommitMeta"
        },
        "id": {
          "type": "string",
          "x-go-name": "ID"
        },
-        "message": {
-          "type": "string",
-          "x-go-name": "Message"
-        },
        "name": {
          "type": "string",
          "x-go-name": "Name"
        },
-        "tagger": {
-          "$ref": "#/definitions/CommitUser"
-        },
        "tarball_url": {
          "type": "string",
          "x-go-name": "TarballURL"
@ -15423,30 +14843,6 @@
      },
      "x-go-package": "code.gitea.io/gitea/modules/structs"
    },
-    "TagCommit": {
-      "type": "object",
-      "properties": {
-        "author": {
-          "$ref": "#/definitions/CommitUser"
-        },
-        "commiter": {
-          "$ref": "#/definitions/CommitUser"
-        },
-        "message": {
-          "type": "string",
-          "x-go-name": "Message"
-        },
-        "sha": {
-          "type": "string",
-          "x-go-name": "SHA"
-        },
-        "url": {
-          "type": "string",
-          "x-go-name": "URL"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
    "Team": {
      "description": "Team represents a team in an organization",
      "type": "object",
@ -15770,105 +15166,6 @@
        }
      },
      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
-    "WikiCommit": {
-      "type": "object",
-      "properties": {
-        "author": {
-          "$ref": "#/definitions/WikiUser"
-        },
-        "id": {
-          "type": "string",
-          "x-go-name": "ID"
-        },
-        "message": {
-          "type": "string",
-          "x-go-name": "Message"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
-    "WikiOption": {
-      "type": "object",
-      "properties": {
-        "commit_message": {
-          "type": "string",
-          "x-go-name": "CommitMessage"
-        },
-        "content": {
-          "type": "string",
-          "x-go-name": "Content"
-        },
-        "name": {
-          "type": "string",
-          "x-go-name": "Name"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
-    "WikiResponse": {
-      "type": "object",
-      "properties": {
-        "commit": {
-          "$ref": "#/definitions/WikiCommit"
-        },
-        "commit_counts": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "CommitCounts"
-        },
-        "md_content": {
-          "type": "string",
-          "x-go-name": "MdContent"
-        },
-        "name": {
-          "type": "string",
-          "x-go-name": "Name"
-        },
-        "simple_content": {
-          "type": "string",
-          "x-go-name": "SimpleContent"
-        },
-        "wiki_clone_link": {
-          "$ref": "#/definitions/CloneLink"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
-    "WikiUser": {
-      "type": "object",
-      "properties": {
-        "email": {
-          "type": "string",
-          "x-go-name": "Email"
-        },
-        "name": {
-          "type": "string",
-          "x-go-name": "Name"
-        },
-        "when": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "When"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
-    "WikiesResponse": {
-      "type": "object",
-      "properties": {
-        "commit": {
-          "$ref": "#/definitions/WikiCommit"
-        },
-        "name": {
-          "type": "string",
-          "x-go-name": "Name"
-        },
-        "wiki_clone_link": {
-          "$ref": "#/definitions/CloneLink"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
    }
  },
  "responses": {
@ -16051,41 +15348,6 @@
        "$ref": "#/definitions/APIError"
      }
    },
-    "FileCommitList": {
-      "description": "FileCommitList",
-      "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Commit"
-        }
-      },
-      "headers": {
-        "X-HasMore": {
-          "type": "boolean",
-          "description": "True if there is another page"
-        },
-        "X-Page": {
-          "type": "integer",
-          "format": "int64",
-          "description": "The current page"
-        },
-        "X-PageCount": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Total number of pages"
-        },
-        "X-PerPage": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Commits per page"
-        },
-        "X-Total": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Total commit count"
-        }
-      }
-    },
    "FileDeleteResponse": {
      "description": "FileDeleteResponse",
      "schema": {
@ -16167,15 +15429,6 @@
        }
      }
    },
-    "HookTaskList": {
-      "description": "HookTaskList",
-      "schema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/HookTask"
-        }
-      }
-    },
    "Issue": {
      "description": "Issue",
      "schema": {
@ -16478,32 +15731,6 @@
        "items": {
          "$ref": "#/definitions/Tag"
        }
-      },
-      "headers": {
-        "X-HasMore": {
-          "type": "boolean",
-          "description": "True if there is another page"
-        },
-        "X-Page": {
-          "type": "integer",
-          "format": "int64",
-          "description": "The current page"
-        },
-        "X-PageCount": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Total number of pages"
-        },
-        "X-PerPage": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Commits per page"
-        },
-        "X-Total": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Total commit count"
-        }
      }
    },
    "Team": {
@ -16581,18 +15808,6 @@
        "$ref": "#/definitions/WatchInfo"
      }
    },
-    "Wiki": {
-      "description": "Wiki",
-      "schema": {
-        "$ref": "#/definitions/WikiResponse"
-      }
-    },
-    "WikiList": {
-      "description": "WikiList",
-      "schema": {
-        "$ref": "#/definitions/WikiesResponse"
-      }
-    },
    "empty": {
      "description": "APIEmpty is an empty response"
    },
@ -16724,4 +15939,4 @@
      "TOTPHeader": []
    }
  ]
-}
+}
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@ -58,6 +58,7 @@ github.com/PuerkitoBio/goquery
 # github.com/PuerkitoBio/purell v1.1.1
 github.com/PuerkitoBio/purell
 # github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
+## explicit
 github.com/PuerkitoBio/urlesc
 # github.com/RoaringBitmap/roaring v0.4.23
 ## explicit
@ -100,12 +101,15 @@ github.com/andybalholm/brotli
 # github.com/andybalholm/cascadia v1.1.0
 github.com/andybalholm/cascadia
 # github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239
+## explicit
 github.com/anmitsu/go-shlex
 # github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
 github.com/asaskevich/govalidator
 # github.com/aymerick/douceur v0.2.0
+## explicit
 github.com/aymerick/douceur/css
 # github.com/beorn7/perks v1.0.1
+## explicit
 github.com/beorn7/perks/quantile
 # github.com/bgentry/speakeasy v0.1.0
 ## explicit
@ -176,6 +180,7 @@ github.com/chris-ramon/douceur/parser
 github.com/couchbase/gomemcached
 github.com/couchbase/gomemcached/client
 # github.com/couchbase/goutils v0.0.0-20191018232750-b49639060d85
+## explicit
 github.com/couchbase/goutils/logging
 github.com/couchbase/goutils/scramsha
 # github.com/couchbase/vellum v1.0.1
@ -194,6 +199,7 @@ github.com/couchbaselabs/go-couchbase
 # github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964
 github.com/danwakefield/fnmatch
 # github.com/davecgh/go-spew v1.1.1
+## explicit
 github.com/davecgh/go-spew/spew
 # github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc
 ## explicit
@ -205,6 +211,7 @@ github.com/denisenkom/go-mssqldb/internal/querytext
 ## explicit
 github.com/dgrijalva/jwt-go
 # github.com/dlclark/regexp2 v1.2.0
+## explicit
 github.com/dlclark/regexp2
 github.com/dlclark/regexp2/syntax
 # github.com/dsnet/compress v0.0.1
@ -238,8 +245,10 @@ github.com/ethantkoenig/rupture
 # github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870
 ## explicit
 # github.com/fatih/color v1.9.0
+## explicit
 github.com/fatih/color
 # github.com/fatih/structtag v1.2.0
+## explicit
 github.com/fatih/structtag
 # github.com/fsnotify/fsnotify v1.4.7
 github.com/fsnotify/fsnotify
@ -260,6 +269,7 @@ github.com/go-enry/go-enry/v2/regex
 # github.com/go-enry/go-oniguruma v1.2.1
 github.com/go-enry/go-oniguruma
 # github.com/go-git/gcfg v1.5.0
+## explicit
 github.com/go-git/gcfg
 github.com/go-git/gcfg/scanner
 github.com/go-git/gcfg/token
@ -317,12 +327,19 @@ github.com/go-git/go-git/v5/utils/merkletrie/filesystem
 github.com/go-git/go-git/v5/utils/merkletrie/index
 github.com/go-git/go-git/v5/utils/merkletrie/internal/frame
 github.com/go-git/go-git/v5/utils/merkletrie/noder
+# github.com/go-macaron/gzip v0.0.0-20200329073552-98214d7a897e
+## explicit
+# github.com/go-macaron/toolbox v0.0.0-20200329073429-4401f4ce0f55
+## explicit
 # github.com/go-openapi/analysis v0.19.5
+## explicit
 github.com/go-openapi/analysis
 github.com/go-openapi/analysis/internal
 # github.com/go-openapi/errors v0.19.2
+## explicit
 github.com/go-openapi/errors
 # github.com/go-openapi/inflect v0.19.0
+## explicit
 github.com/go-openapi/inflect
 # github.com/go-openapi/jsonpointer v0.19.3
 github.com/go-openapi/jsonpointer
@ -330,9 +347,11 @@ github.com/go-openapi/jsonpointer
 ## explicit
 github.com/go-openapi/jsonreference
 # github.com/go-openapi/loads v0.19.3
+## explicit
 github.com/go-openapi/loads
 github.com/go-openapi/loads/fmts
 # github.com/go-openapi/runtime v0.19.5
+## explicit
 github.com/go-openapi/runtime
 github.com/go-openapi/runtime/logger
 github.com/go-openapi/runtime/middleware
@ -341,12 +360,16 @@ github.com/go-openapi/runtime/middleware/header
 github.com/go-openapi/runtime/middleware/untyped
 github.com/go-openapi/runtime/security
 # github.com/go-openapi/spec v0.19.3
+## explicit
 github.com/go-openapi/spec
 # github.com/go-openapi/strfmt v0.19.3
+## explicit
 github.com/go-openapi/strfmt
 # github.com/go-openapi/swag v0.19.5
+## explicit
 github.com/go-openapi/swag
 # github.com/go-openapi/validate v0.19.3
+## explicit
 github.com/go-openapi/validate
 # github.com/go-redis/redis v6.15.2+incompatible
 ## explicit
@ -361,6 +384,7 @@ github.com/go-redis/redis/internal/util
 ## explicit
 github.com/go-sql-driver/mysql
 # github.com/go-stack/stack v1.8.0
+## explicit
 github.com/go-stack/stack
 # github.com/go-swagger/go-swagger v0.21.0
 ## explicit
@ -394,17 +418,20 @@ github.com/gogs/cron
 # github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe
 github.com/golang-sql/civil
 # github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721
+## explicit
 github.com/golang/gddo/httputil
 github.com/golang/gddo/httputil/header
 # github.com/golang/protobuf v1.4.1
 ## explicit
 github.com/golang/protobuf/proto
 # github.com/golang/snappy v0.0.1
+## explicit
 github.com/golang/snappy
 # github.com/google/go-github/v32 v32.1.0
 ## explicit
 github.com/google/go-github/v32/github
 # github.com/google/go-querystring v1.0.0
+## explicit
 github.com/google/go-querystring/query
 # github.com/google/uuid v1.1.1
 ## explicit
@ -413,8 +440,10 @@ github.com/google/uuid
 ## explicit
 github.com/gorilla/context
 # github.com/gorilla/css v1.0.0
+## explicit
 github.com/gorilla/css/scanner
 # github.com/gorilla/handlers v1.4.2
+## explicit
 github.com/gorilla/handlers
 # github.com/gorilla/mux v1.7.3
 github.com/gorilla/mux
@ -454,6 +483,7 @@ github.com/jaytaylor/html2text
 # github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
 github.com/jbenet/go-context/io
 # github.com/jessevdk/go-flags v1.4.0
+## explicit
 github.com/jessevdk/go-flags
 # github.com/jmhodges/levigo v1.0.0
 ## explicit
@ -489,6 +519,7 @@ github.com/klauspost/compress/zstd/internal/xxhash
 # github.com/klauspost/pgzip v1.2.1
 github.com/klauspost/pgzip
 # github.com/kr/pretty v0.1.0
+## explicit
 github.com/kr/pretty
 # github.com/kr/text v0.2.0
 github.com/kr/text
@ -505,8 +536,10 @@ github.com/lib/pq/scram
 ## explicit
 github.com/lunny/dingtalk_webhook
 # github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de
+## explicit
 github.com/lunny/log
 # github.com/lunny/nodb v0.0.0-20160621015157-fc1ef06ad4af
+## explicit
 github.com/lunny/nodb
 github.com/lunny/nodb/config
 github.com/lunny/nodb/store
@ -547,6 +580,7 @@ github.com/mattn/go-runewidth
 ## explicit
 github.com/mattn/go-sqlite3
 # github.com/matttproud/golang_protobuf_extensions v1.0.1
+## explicit
 github.com/matttproud/golang_protobuf_extensions/pbutil
 # github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75
 ## explicit
@ -586,6 +620,7 @@ github.com/niklasfasching/go-org/org
 # github.com/nwaples/rardecode v1.0.0
 github.com/nwaples/rardecode
 # github.com/olekukonko/tablewriter v0.0.4
+## explicit
 github.com/olekukonko/tablewriter
 # github.com/oliamb/cutter v0.2.2
 ## explicit
@ -598,14 +633,17 @@ github.com/olivere/elastic/v7/uritemplates
 # github.com/pelletier/go-toml v1.4.0
 github.com/pelletier/go-toml
 # github.com/philhofer/fwd v1.0.0
+## explicit
 github.com/philhofer/fwd
 # github.com/pierrec/lz4 v2.0.5+incompatible
+## explicit
 github.com/pierrec/lz4
 github.com/pierrec/lz4/internal/xxh32
 # github.com/pkg/errors v0.9.1
 ## explicit
 github.com/pkg/errors
 # github.com/pmezard/go-difflib v1.0.0
+## explicit
 github.com/pmezard/go-difflib/difflib
 # github.com/pquerna/otp v1.2.0
 ## explicit
@ -621,6 +659,7 @@ github.com/prometheus/client_golang/prometheus/promhttp
 ## explicit
 github.com/prometheus/client_model/go
 # github.com/prometheus/common v0.6.0
+## explicit
 github.com/prometheus/common/expfmt
 github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
 github.com/prometheus/common/model
@ -645,9 +684,8 @@ github.com/shurcooL/httpfs/vfsutil
 ## explicit
 github.com/shurcooL/vfsgen
 # github.com/siddontang/go-snappy v0.0.0-20140704025258-d8f7bb82a96d
-github.com/siddontang/go-snappy/snappy
-# github.com/smartystreets/goconvey v1.6.4
 ## explicit
+github.com/siddontang/go-snappy/snappy
 # github.com/spf13/afero v1.2.2
 github.com/spf13/afero
 github.com/spf13/afero/mem
@ -658,6 +696,7 @@ github.com/spf13/jwalterweatherman
 # github.com/spf13/pflag v1.0.5
 github.com/spf13/pflag
 # github.com/spf13/viper v1.4.0
+## explicit
 github.com/spf13/viper
 # github.com/steveyen/gtreap v0.1.0
 github.com/steveyen/gtreap
@ -666,6 +705,7 @@ github.com/steveyen/gtreap
 github.com/stretchr/testify/assert
 github.com/stretchr/testify/require
 # github.com/syndtr/goleveldb v1.0.0
+## explicit
 github.com/syndtr/goleveldb/leveldb
 github.com/syndtr/goleveldb/leveldb/cache
 github.com/syndtr/goleveldb/leveldb/comparer
@ -684,6 +724,7 @@ github.com/syndtr/goleveldb/leveldb/util
 ## explicit
 github.com/tinylib/msgp/msgp
 # github.com/toqueteos/webbrowser v1.2.0
+## explicit
 github.com/toqueteos/webbrowser
 # github.com/tstranex/u2f v1.0.0
 ## explicit
@ -737,6 +778,7 @@ github.com/yuin/goldmark-meta
 # go.etcd.io/bbolt v1.3.4
 go.etcd.io/bbolt
 # go.mongodb.org/mongo-driver v1.1.1
+## explicit
 go.mongodb.org/mongo-driver/bson
 go.mongodb.org/mongo-driver/bson/bsoncodec
 go.mongodb.org/mongo-driver/bson/bsonrw
@ -772,6 +814,7 @@ golang.org/x/crypto/ssh/agent
 golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
 golang.org/x/crypto/ssh/knownhosts
 # golang.org/x/mod v0.2.0
+## explicit
 golang.org/x/mod/module
 golang.org/x/mod/semver
 # golang.org/x/net v0.0.0-20200602114024-627f9648deb9
@ -848,6 +891,7 @@ golang.org/x/tools/internal/gopathwalk
 golang.org/x/tools/internal/imports
 golang.org/x/tools/internal/packagesinternal
 # golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
+## explicit
 golang.org/x/xerrors
 golang.org/x/xerrors/internal
 # google.golang.org/appengine v1.6.5
@ -863,6 +907,7 @@ google.golang.org/appengine/internal/remote_api
 google.golang.org/appengine/internal/urlfetch
 google.golang.org/appengine/urlfetch
 # google.golang.org/protobuf v1.22.0
+## explicit
 google.golang.org/protobuf/encoding/prototext
 google.golang.org/protobuf/encoding/protowire
 google.golang.org/protobuf/internal/descfmt
@ -905,7 +950,10 @@ gopkg.in/ini.v1
 # gopkg.in/ldap.v3 v3.0.2
 ## explicit
 gopkg.in/ldap.v3
+# gopkg.in/macaron.v1 v1.4.0
+## explicit
 # gopkg.in/warnings.v0 v0.1.2
+## explicit
 gopkg.in/warnings.v0
 # gopkg.in/yaml.v2 v2.3.0
 ## explicit