mirror of https://github.com/go-gitea/gitea.git
Start working on diff page
Unknown
11 years ago
parent
c1a3d4fefb
commit
87de66561c
@ -0,0 +1,137 @@
|
||||
commit c1a3d4fefbbbf332cd1cedda66e93bf40cc9713d
|
||||
Author: Unknown <joe2010xtmf@163.com>
|
||||
Date: Tue Mar 25 21:37:18 2014 -0400
|
||||
|
||||
Add mail notify for creating issue
|
||||
|
||||
diff --git a/gogs.go b/gogs.go
|
||||
index b62580f..f5a328a 100644
|
||||
--- a/gogs.go
|
||||
+++ b/gogs.go
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
|
||||
const go12tag = true
|
||||
|
||||
-const APP_VER = "0.1.7.0325"
|
||||
+const APP_VER = "0.1.8.0325"
|
||||
|
||||
func init() {
|
||||
base.AppVer = APP_VER
|
||||
diff --git a/models/issue.go b/models/issue.go
|
||||
index 2bdd083..2de6568 100644
|
||||
--- a/models/issue.go
|
||||
+++ b/models/issue.go
|
||||
@@ -59,7 +59,6 @@ func CreateIssue(userId, repoId, milestoneId, assigneeId int64, name, labels, co
|
||||
Content: content,
|
||||
}
|
||||
_, err = orm.Insert(issue)
|
||||
- // TODO: newIssueAction
|
||||
return issue, err
|
||||
}
|
||||
|
||||
diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
|
||||
index 92acd20..d0decbe 100644
|
||||
--- a/modules/mailer/mail.go
|
||||
+++ b/modules/mailer/mail.go
|
||||
@@ -6,6 +6,7 @@ package mailer
|
||||
|
||||
import (
|
||||
"encoding/hex"
|
||||
+ "errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/gogits/gogs/models"
|
||||
@@ -15,12 +16,17 @@ import (
|
||||
)
|
||||
|
||||
// Create New mail message use MailFrom and MailUser
|
||||
-func NewMailMessage(To []string, subject, body string) Message {
|
||||
- msg := NewHtmlMessage(To, base.MailService.User, subject, body)
|
||||
+func NewMailMessageFrom(To []string, from, subject, body string) Message {
|
||||
+ msg := NewHtmlMessage(To, from, subject, body)
|
||||
msg.User = base.MailService.User
|
||||
return msg
|
||||
}
|
||||
|
||||
+// Create New mail message use MailFrom and MailUser
|
||||
+func NewMailMessage(To []string, subject, body string) Message {
|
||||
+ return NewMailMessageFrom(To, base.MailService.User, subject, body)
|
||||
+}
|
||||
+
|
||||
func GetMailTmplData(user *models.User) map[interface{}]interface{} {
|
||||
data := make(map[interface{}]interface{}, 10)
|
||||
data["AppName"] = base.AppName
|
||||
@@ -84,3 +90,33 @@ func SendActiveMail(r *middleware.Render, user *models.User) {
|
||||
|
||||
SendAsync(&msg)
|
||||
}
|
||||
+
|
||||
+// SendNotifyMail sends mail notification of all watchers.
|
||||
+func SendNotifyMail(userId, repoId int64, userName, repoName, subject, content string) error {
|
||||
+ watches, err := models.GetWatches(repoId)
|
||||
+ if err != nil {
|
||||
+ return errors.New("mail.NotifyWatchers(get watches): " + err.Error())
|
||||
+ }
|
||||
+
|
||||
+ tos := make([]string, 0, len(watches))
|
||||
+ for i := range watches {
|
||||
+ uid := watches[i].UserId
|
||||
+ if userId == uid {
|
||||
+ continue
|
||||
+ }
|
||||
+ u, err := models.GetUserById(uid)
|
||||
+ if err != nil {
|
||||
+ return errors.New("mail.NotifyWatchers(get user): " + err.Error())
|
||||
+ }
|
||||
+ tos = append(tos, u.Email)
|
||||
+ }
|
||||
+
|
||||
+ if len(tos) == 0 {
|
||||
+ return nil
|
||||
+ }
|
||||
+
|
||||
+ msg := NewMailMessageFrom(tos, userName, subject, content)
|
||||
+ msg.Info = fmt.Sprintf("Subject: %s, send notify emails", subject)
|
||||
+ SendAsync(&msg)
|
||||
+ return nil
|
||||
+}
|
||||
diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
|
||||
index da63e01..63861d8 100644
|
||||
--- a/modules/mailer/mailer.go
|
||||
+++ b/modules/mailer/mailer.go
|
||||
@@ -33,7 +33,7 @@ func (m Message) Content() string {
|
||||
}
|
||||
|
||||
// create mail content
|
||||
- content := "From: " + m.User + "<" + m.From +
|
||||
+ content := "From: " + m.From + "<" + m.User +
|
||||
">\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body
|
||||
return content
|
||||
}
|
||||
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
|
||||
index fc5bb98..242593f 100644
|
||||
--- a/routers/repo/issue.go
|
||||
+++ b/routers/repo/issue.go
|
||||
@@ -13,6 +13,7 @@ import (
|
||||
"github.com/gogits/gogs/modules/auth"
|
||||
"github.com/gogits/gogs/modules/base"
|
||||
"github.com/gogits/gogs/modules/log"
|
||||
+ "github.com/gogits/gogs/modules/mailer"
|
||||
"github.com/gogits/gogs/modules/middleware"
|
||||
)
|
||||
|
||||
@@ -86,6 +87,14 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
|
||||
return
|
||||
}
|
||||
|
||||
+ // Mail watchers.
|
||||
+ if base.Service.NotifyMail {
|
||||
+ if err = mailer.SendNotifyMail(ctx.User.Id, ctx.Repo.Repository.Id, ctx.User.Name, ctx.Repo.Repository.Name, issue.Name, issue.Content); err != nil {
|
||||
+ ctx.Handle(200, "issue.CreateIssue", err)
|
||||
+ return
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.Id)
|
||||
ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index))
|
||||
}
|
||||
@ -0,0 +1,272 @@
|
||||
// Copyright 2014 The Gogs Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package models
|
||||
|
||||
import (
|
||||
"container/list"
|
||||
"fmt"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"github.com/Unknwon/com"
|
||||
|
||||
"github.com/gogits/git"
|
||||
)
|
||||
|
||||
// RepoFile represents a file object in git repository.
|
||||
type RepoFile struct {
|
||||
*git.TreeEntry
|
||||
Path string
|
||||
Size int64
|
||||
Repo *git.Repository
|
||||
Commit *git.Commit
|
||||
}
|
||||
|
||||
// LookupBlob returns the content of an object.
|
||||
func (file *RepoFile) LookupBlob() (*git.Blob, error) {
|
||||
if file.Repo == nil {
|
||||
return nil, ErrRepoFileNotLoaded
|
||||
}
|
||||
|
||||
return file.Repo.LookupBlob(file.Id)
|
||||
}
|
||||
|
||||
// GetBranches returns all branches of given repository.
|
||||
func GetBranches(userName, reposName string) ([]string, error) {
|
||||
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
refs, err := repo.AllReferences()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
brs := make([]string, len(refs))
|
||||
for i, ref := range refs {
|
||||
brs[i] = ref.Name
|
||||
}
|
||||
return brs, nil
|
||||
}
|
||||
|
||||
func GetTargetFile(userName, reposName, branchName, commitId, rpath string) (*RepoFile, error) {
|
||||
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
commit, err := repo.GetCommit(branchName, commitId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
parts := strings.Split(path.Clean(rpath), "/")
|
||||
|
||||
var entry *git.TreeEntry
|
||||
tree := commit.Tree
|
||||
for i, part := range parts {
|
||||
if i == len(parts)-1 {
|
||||
entry = tree.EntryByName(part)
|
||||
if entry == nil {
|
||||
return nil, ErrRepoFileNotExist
|
||||
}
|
||||
} else {
|
||||
tree, err = repo.SubTree(tree, part)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
size, err := repo.ObjectSize(entry.Id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
repoFile := &RepoFile{
|
||||
entry,
|
||||
rpath,
|
||||
size,
|
||||
repo,
|
||||
commit,
|
||||
}
|
||||
|
||||
return repoFile, nil
|
||||
}
|
||||
|
||||
// GetReposFiles returns a list of file object in given directory of repository.
|
||||
func GetReposFiles(userName, reposName, branchName, commitId, rpath string) ([]*RepoFile, error) {
|
||||
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
commit, err := repo.GetCommit(branchName, commitId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var repodirs []*RepoFile
|
||||
var repofiles []*RepoFile
|
||||
commit.Tree.Walk(func(dirname string, entry *git.TreeEntry) int {
|
||||
if dirname == rpath {
|
||||
// TODO: size get method shoule be improved
|
||||
size, err := repo.ObjectSize(entry.Id)
|
||||
if err != nil {
|
||||
return 0
|
||||
}
|
||||
|
||||
var cm = commit
|
||||
var i int
|
||||
for {
|
||||
i = i + 1
|
||||
//fmt.Println(".....", i, cm.Id(), cm.ParentCount())
|
||||
if cm.ParentCount() == 0 {
|
||||
break
|
||||
} else if cm.ParentCount() == 1 {
|
||||
pt, _ := repo.SubTree(cm.Parent(0).Tree, dirname)
|
||||
if pt == nil {
|
||||
break
|
||||
}
|
||||
pEntry := pt.EntryByName(entry.Name)
|
||||
if pEntry == nil || !pEntry.Id.Equal(entry.Id) {
|
||||
break
|
||||
} else {
|
||||
cm = cm.Parent(0)
|
||||
}
|
||||
} else {
|
||||
var emptyCnt = 0
|
||||
var sameIdcnt = 0
|
||||
var lastSameCm *git.Commit
|
||||
//fmt.Println(".....", cm.ParentCount())
|
||||
for i := 0; i < cm.ParentCount(); i++ {
|
||||
//fmt.Println("parent", i, cm.Parent(i).Id())
|
||||
p := cm.Parent(i)
|
||||
pt, _ := repo.SubTree(p.Tree, dirname)
|
||||
var pEntry *git.TreeEntry
|
||||
if pt != nil {
|
||||
pEntry = pt.EntryByName(entry.Name)
|
||||
}
|
||||
|
||||
//fmt.Println("pEntry", pEntry)
|
||||
|
||||
if pEntry == nil {
|
||||
emptyCnt = emptyCnt + 1
|
||||
if emptyCnt+sameIdcnt == cm.ParentCount() {
|
||||
if lastSameCm == nil {
|
||||
goto loop
|
||||
} else {
|
||||
cm = lastSameCm
|
||||
break
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//fmt.Println(i, "pEntry", pEntry.Id, "entry", entry.Id)
|
||||
if !pEntry.Id.Equal(entry.Id) {
|
||||
goto loop
|
||||
} else {
|
||||
lastSameCm = cm.Parent(i)
|
||||
sameIdcnt = sameIdcnt + 1
|
||||
if emptyCnt+sameIdcnt == cm.ParentCount() {
|
||||
// TODO: now follow the first parent commit?
|
||||
cm = lastSameCm
|
||||
//fmt.Println("sameId...")
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
loop:
|
||||
|
||||
rp := &RepoFile{
|
||||
entry,
|
||||
path.Join(dirname, entry.Name),
|
||||
size,
|
||||
repo,
|
||||
cm,
|
||||
}
|
||||
|
||||
if entry.IsFile() {
|
||||
repofiles = append(repofiles, rp)
|
||||
} else if entry.IsDir() {
|
||||
repodirs = append(repodirs, rp)
|
||||
}
|
||||
}
|
||||
return 0
|
||||
})
|
||||
|
||||
return append(repodirs, repofiles...), nil
|
||||
}
|
||||
|
||||
func GetCommit(userName, repoName, branchname, commitid string) (*git.Commit, error) {
|
||||
repo, err := git.OpenRepository(RepoPath(userName, repoName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return repo.GetCommit(branchname, commitid)
|
||||
}
|
||||
|
||||
// GetCommits returns all commits of given branch of repository.
|
||||
func GetCommits(userName, reposName, branchname string) (*list.List, error) {
|
||||
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
r, err := repo.LookupReference(fmt.Sprintf("refs/heads/%s", branchname))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return r.AllCommits()
|
||||
}
|
||||
|
||||
type DiffFile struct {
|
||||
Name string
|
||||
Addition, Deletion int
|
||||
Type string
|
||||
Content []string
|
||||
}
|
||||
|
||||
type Diff struct {
|
||||
NumFiles int // Number of file has been changed.
|
||||
TotalAddition, TotalDeletion int
|
||||
Files []*DiffFile
|
||||
}
|
||||
|
||||
func GetDiff(repoPath, commitid string) (*Diff, error) {
|
||||
stdout, _, err := com.ExecCmdDir(repoPath, "git", "show", commitid)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Sperate parts by file.
|
||||
parts := strings.Split(stdout, "diff --git ")
|
||||
|
||||
// First part is commit information.
|
||||
// Check if it's a merge.
|
||||
mergeIndex := strings.Index(parts[0], "merge")
|
||||
if mergeIndex > -1 {
|
||||
mergeCommit := strings.SplitN(strings.Split(parts[0], "\n")[1], "", 3)[2]
|
||||
return GetDiff(repoPath, mergeCommit)
|
||||
}
|
||||
|
||||
diff := &Diff{NumFiles: len(parts[1:])}
|
||||
diff.Files = make([]*DiffFile, 0, diff.NumFiles)
|
||||
for _, part := range parts[1:] {
|
||||
infos := strings.SplitN(part, "\n", 6)
|
||||
infos[5] = strings.TrimSuffix(strings.TrimSuffix(infos[5], "\n"), "\n\\ No newline at end of file")
|
||||
|
||||
file := &DiffFile{
|
||||
Name: strings.TrimPrefix(strings.Split(infos[0], " ")[0], "a/"),
|
||||
Content: strings.Split(infos[5], "\n"),
|
||||
}
|
||||
diff.Files = append(diff.Files, file)
|
||||
}
|
||||
return diff, nil
|
||||
}
|
||||
Loading…
Reference in New Issue