mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-25 21:44:20 -04:00
Merge branch 'master' of https://github.com/gogits/gogs
This commit is contained in:
commit
7b9d4d126a
3
bee.json
3
bee.json
@ -13,7 +13,8 @@
|
|||||||
"others": [
|
"others": [
|
||||||
"modules",
|
"modules",
|
||||||
"$GOPATH/src/github.com/gogits/binding",
|
"$GOPATH/src/github.com/gogits/binding",
|
||||||
"$GOPATH/src/github.com/gogits/git"
|
"$GOPATH/src/github.com/gogits/git",
|
||||||
|
"$GOPATH/src/github.com/gogits/gfm"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"cmd_args": [
|
"cmd_args": [
|
||||||
|
@ -91,5 +91,5 @@ func GetStatistic() (stats Statistic) {
|
|||||||
stats.Counter.Watch, _ = orm.Count(new(Watch))
|
stats.Counter.Watch, _ = orm.Count(new(Watch))
|
||||||
stats.Counter.Action, _ = orm.Count(new(Action))
|
stats.Counter.Action, _ = orm.Count(new(Action))
|
||||||
stats.Counter.Access, _ = orm.Count(new(Access))
|
stats.Counter.Access, _ = orm.Count(new(Access))
|
||||||
return stats
|
return
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ func (options *CustomRender) Link(out *bytes.Buffer, link []byte, title []byte,
|
|||||||
|
|
||||||
func RenderMarkdown(rawBytes []byte, urlPrefix string) []byte {
|
func RenderMarkdown(rawBytes []byte, urlPrefix string) []byte {
|
||||||
htmlFlags := 0
|
htmlFlags := 0
|
||||||
htmlFlags |= gfm.HTML_USE_XHTML
|
// htmlFlags |= gfm.HTML_USE_XHTML
|
||||||
// htmlFlags |= gfm.HTML_USE_SMARTYPANTS
|
// htmlFlags |= gfm.HTML_USE_SMARTYPANTS
|
||||||
// htmlFlags |= gfm.HTML_SMARTYPANTS_FRACTIONS
|
// htmlFlags |= gfm.HTML_SMARTYPANTS_FRACTIONS
|
||||||
// htmlFlags |= gfm.HTML_SMARTYPANTS_LATEX_DASHES
|
// htmlFlags |= gfm.HTML_SMARTYPANTS_LATEX_DASHES
|
||||||
@ -81,7 +81,7 @@ func RenderMarkdown(rawBytes []byte, urlPrefix string) []byte {
|
|||||||
htmlFlags |= gfm.HTML_SKIP_SCRIPT
|
htmlFlags |= gfm.HTML_SKIP_SCRIPT
|
||||||
htmlFlags |= gfm.HTML_GITHUB_BLOCKCODE
|
htmlFlags |= gfm.HTML_GITHUB_BLOCKCODE
|
||||||
htmlFlags |= gfm.HTML_OMIT_CONTENTS
|
htmlFlags |= gfm.HTML_OMIT_CONTENTS
|
||||||
htmlFlags |= gfm.HTML_COMPLETE_PAGE
|
// htmlFlags |= gfm.HTML_COMPLETE_PAGE
|
||||||
renderer := &CustomRender{
|
renderer := &CustomRender{
|
||||||
Renderer: gfm.HtmlRenderer(htmlFlags, "", ""),
|
Renderer: gfm.HtmlRenderer(htmlFlags, "", ""),
|
||||||
urlPrefix: urlPrefix,
|
urlPrefix: urlPrefix,
|
||||||
|
@ -175,6 +175,10 @@
|
|||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.markdown img {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.markdown .btn {
|
.markdown .btn {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
156
serve.go
156
serve.go
@ -5,14 +5,19 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"container/list"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/codegangsta/cli"
|
"github.com/codegangsta/cli"
|
||||||
|
"github.com/gogits/gogs/modules/log"
|
||||||
|
|
||||||
|
"github.com/gogits/git"
|
||||||
"github.com/gogits/gogs/models"
|
"github.com/gogits/gogs/models"
|
||||||
"github.com/gogits/gogs/modules/base"
|
"github.com/gogits/gogs/modules/base"
|
||||||
)
|
)
|
||||||
@ -39,12 +44,27 @@ gogs serv provide access auth for repositories`,
|
|||||||
Flags: []cli.Flag{},
|
Flags: []cli.Flag{},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parseCmd(cmd string) (string, string) {
|
||||||
|
ss := strings.SplitN(cmd, " ", 2)
|
||||||
|
if len(ss) != 2 {
|
||||||
|
return "", ""
|
||||||
|
}
|
||||||
|
|
||||||
|
verb, args := ss[0], ss[1]
|
||||||
|
if verb == "git" {
|
||||||
|
ss = strings.SplitN(args, " ", 2)
|
||||||
|
args = ss[1]
|
||||||
|
verb = fmt.Sprintf("%s %s", verb, ss[0])
|
||||||
|
}
|
||||||
|
return verb, args
|
||||||
|
}
|
||||||
|
|
||||||
func In(b string, sl map[string]int) bool {
|
func In(b string, sl map[string]int) bool {
|
||||||
_, e := sl[b]
|
_, e := sl[b]
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
func runServ(*cli.Context) {
|
func runServ(k *cli.Context) {
|
||||||
base.NewConfigContext()
|
base.NewConfigContext()
|
||||||
models.LoadModelsConfig()
|
models.LoadModelsConfig()
|
||||||
models.NewEngine()
|
models.NewEngine()
|
||||||
@ -84,15 +104,16 @@ func runServ(*cli.Context) {
|
|||||||
repoName = repoName[:len(repoName)-4]
|
repoName = repoName[:len(repoName)-4]
|
||||||
}
|
}
|
||||||
|
|
||||||
os.Setenv("userName", user.Name)
|
|
||||||
os.Setenv("userId", strconv.Itoa(int(user.Id)))
|
|
||||||
repo, err := models.GetRepositoryByName(user.Id, repoName)
|
repo, err := models.GetRepositoryByName(user.Id, repoName)
|
||||||
|
var isExist bool = true
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Unavilable repository", err)
|
if err == models.ErrRepoNotExist {
|
||||||
return
|
isExist = false
|
||||||
|
} else {
|
||||||
|
println("Unavilable repository", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
os.Setenv("repoId", strconv.Itoa(int(repo.Id)))
|
|
||||||
os.Setenv("repoName", repoName)
|
|
||||||
|
|
||||||
isWrite := In(verb, COMMANDS_WRITE)
|
isWrite := In(verb, COMMANDS_WRITE)
|
||||||
isRead := In(verb, COMMANDS_READONLY)
|
isRead := In(verb, COMMANDS_READONLY)
|
||||||
@ -130,12 +151,6 @@ func runServ(*cli.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
isExist, err := models.IsRepositoryExist(user, repoName)
|
|
||||||
if err != nil {
|
|
||||||
println("Inernel error:", err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if !isExist {
|
if !isExist {
|
||||||
if isRead {
|
if isRead {
|
||||||
println("Repository", user.Name+"/"+repoName, "is not exist")
|
println("Repository", user.Name+"/"+repoName, "is not exist")
|
||||||
@ -149,28 +164,119 @@ func runServ(*cli.Context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rep, err := git.OpenRepository(models.RepoPath(user.Name, repoName))
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
refs, err := rep.AllReferencesMap()
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
gitcmd := exec.Command(verb, rRepo)
|
gitcmd := exec.Command(verb, rRepo)
|
||||||
gitcmd.Dir = base.RepoRootPath
|
gitcmd.Dir = base.RepoRootPath
|
||||||
gitcmd.Stdout = os.Stdout
|
|
||||||
|
var s string
|
||||||
|
b := bytes.NewBufferString(s)
|
||||||
|
|
||||||
|
gitcmd.Stdout = io.MultiWriter(os.Stdout, b)
|
||||||
|
//gitcmd.Stdin = io.MultiReader(os.Stdin, b)
|
||||||
gitcmd.Stdin = os.Stdin
|
gitcmd.Stdin = os.Stdin
|
||||||
gitcmd.Stderr = os.Stderr
|
gitcmd.Stderr = os.Stderr
|
||||||
|
|
||||||
if err = gitcmd.Run(); err != nil {
|
if err = gitcmd.Run(); err != nil {
|
||||||
println("execute command error:", err.Error())
|
println("execute command error:", err.Error())
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func parseCmd(cmd string) (string, string) {
|
if !strings.HasPrefix(cmd, "git-receive-pack") {
|
||||||
ss := strings.SplitN(cmd, " ", 2)
|
return
|
||||||
if len(ss) != 2 {
|
|
||||||
return "", ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
verb, args := ss[0], ss[1]
|
// update
|
||||||
if verb == "git" {
|
//w, _ := os.Create("serve.log")
|
||||||
ss = strings.SplitN(args, " ", 2)
|
//defer w.Close()
|
||||||
args = ss[1]
|
//log.SetOutput(w)
|
||||||
verb = fmt.Sprintf("%s %s", verb, ss[0])
|
|
||||||
|
var t = "ok refs/heads/"
|
||||||
|
var i int
|
||||||
|
var refname string
|
||||||
|
for {
|
||||||
|
l, err := b.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
i = i + 1
|
||||||
|
l = l[:len(l)-1]
|
||||||
|
idx := strings.Index(l, t)
|
||||||
|
if idx > 0 {
|
||||||
|
refname = l[idx+len(t):]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var ref *git.Reference
|
||||||
|
var ok bool
|
||||||
|
|
||||||
|
var l *list.List
|
||||||
|
//log.Info("----", refname, "-----")
|
||||||
|
if ref, ok = refs[refname]; !ok {
|
||||||
|
refs, err = rep.AllReferencesMap()
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ref, ok = refs[refname]; !ok {
|
||||||
|
println("unknow reference name -", refname, "-")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
l, err = ref.AllCommits()
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
//log.Info("----", ref, "-----")
|
||||||
|
var last *git.Commit
|
||||||
|
//log.Info("00000", ref.Oid.String())
|
||||||
|
last, err = ref.LastCommit()
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ref2, err := rep.LookupReference(ref.Name)
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
//log.Info("11111", ref2.Oid.String())
|
||||||
|
before, err := ref2.LastCommit()
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
//log.Info("----", before.Id(), "-----", last.Id())
|
||||||
|
l = ref.CommitsBetween(before, last)
|
||||||
|
}
|
||||||
|
|
||||||
|
commits := make([][]string, 0)
|
||||||
|
for e := l.Back(); e != nil; e = e.Prev() {
|
||||||
|
commit := e.Value.(*git.Commit)
|
||||||
|
commits = append(commits, []string{commit.Id().String(), commit.Message()})
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = models.CommitRepoAction(user.Id, user.Name,
|
||||||
|
repo.Id, ref.BranchName(), commits); err != nil {
|
||||||
|
log.Error("runUpdate.models.CommitRepoAction: %v", err, commits)
|
||||||
|
} else {
|
||||||
|
//log.Info("refname", refname)
|
||||||
|
//log.Info("Listen: %v", cmd)
|
||||||
|
//fmt.Println("...", cmd)
|
||||||
|
|
||||||
|
//runUpdate(k)
|
||||||
|
c := exec.Command("exec", "git", "update-server-info")
|
||||||
|
c.Run()
|
||||||
}
|
}
|
||||||
return verb, args
|
|
||||||
}
|
}
|
||||||
|
22
update.go
22
update.go
@ -4,16 +4,9 @@
|
|||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import "github.com/codegangsta/cli"
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"github.com/codegangsta/cli"
|
//"github.com/gogits/gogs/modules/log"
|
||||||
|
|
||||||
"github.com/gogits/git"
|
|
||||||
"github.com/gogits/gogs/models"
|
|
||||||
"github.com/gogits/gogs/modules/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
var CmdUpdate = cli.Command{
|
var CmdUpdate = cli.Command{
|
||||||
Name: "update",
|
Name: "update",
|
||||||
@ -26,6 +19,9 @@ gogs serv provide access auth for repositories`,
|
|||||||
|
|
||||||
// for command: ./gogs update
|
// for command: ./gogs update
|
||||||
func runUpdate(*cli.Context) {
|
func runUpdate(*cli.Context) {
|
||||||
|
/*w, _ := os.Create("update.log")
|
||||||
|
log.SetOutput(w)
|
||||||
|
|
||||||
userName := os.Getenv("userName")
|
userName := os.Getenv("userName")
|
||||||
userId := os.Getenv("userId")
|
userId := os.Getenv("userId")
|
||||||
repoId := os.Getenv("repoId")
|
repoId := os.Getenv("repoId")
|
||||||
@ -35,16 +31,19 @@ func runUpdate(*cli.Context) {
|
|||||||
|
|
||||||
repo, err := git.OpenRepository(f)
|
repo, err := git.OpenRepository(f)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Error("runUpdate.Open repoId: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
ref, err := repo.LookupReference("HEAD")
|
ref, err := repo.LookupReference("HEAD")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Error("runUpdate.Ref repoId: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
lastCommit, err := repo.LookupCommit(ref.Oid)
|
lastCommit, err := repo.LookupCommit(ref.Oid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Error("runUpdate.Commit repoId: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,5 +62,8 @@ func runUpdate(*cli.Context) {
|
|||||||
if err = models.CommitRepoAction(int64(sUserId), userName,
|
if err = models.CommitRepoAction(int64(sUserId), userName,
|
||||||
int64(sRepoId), repoName, commits); err != nil {
|
int64(sRepoId), repoName, commits); err != nil {
|
||||||
log.Error("runUpdate.models.CommitRepoAction: %v", err)
|
log.Error("runUpdate.models.CommitRepoAction: %v", err)
|
||||||
}
|
} else {
|
||||||
|
l := exec.Command("exec", "git", "update-server-info")
|
||||||
|
l.Run()
|
||||||
|
}*/
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user