aboutsummaryrefslogtreecommitdiffstats
path: root/models/update.go
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-06-20 01:14:54 -0400
committerUnknown <joe2010xtmf@163.com>2014-06-20 01:14:54 -0400
commit8bfa7ae7453e56191aa6f7de8067d5b6bb5a4a8b (patch)
treef96bf4166b78a123997a3eb3026cb347b5c3bcc6 /models/update.go
parent6c8d630bef3a58860237856c648e56f4b9cea97d (diff)
downloadgitea-8bfa7ae7453e56191aa6f7de8067d5b6bb5a4a8b.tar.gz
gitea-8bfa7ae7453e56191aa6f7de8067d5b6bb5a4a8b.zip
Remove qiniu/log
Diffstat (limited to 'models/update.go')
-rw-r--r--models/update.go23
1 files changed, 11 insertions, 12 deletions
diff --git a/models/update.go b/models/update.go
index b7242cde85..5675a94cf4 100644
--- a/models/update.go
+++ b/models/update.go
@@ -9,18 +9,17 @@ import (
"os/exec"
"strings"
- qlog "github.com/qiniu/log"
-
"github.com/gogits/git"
"github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/log"
)
func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName string, userId int64) {
isNew := strings.HasPrefix(oldCommitId, "0000000")
if isNew &&
strings.HasPrefix(newCommitId, "0000000") {
- qlog.Fatal("old rev and new rev both 000000")
+ log.GitLogger.Fatal("old rev and new rev both 000000")
}
f := RepoPath(repoUserName, repoName)
@@ -31,18 +30,18 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
isDel := strings.HasPrefix(newCommitId, "0000000")
if isDel {
- qlog.Info("del rev", refName, "from", userName+"/"+repoName+".git", "by", userId)
+ log.GitLogger.Info("del rev", refName, "from", userName+"/"+repoName+".git", "by", userId)
return
}
repo, err := git.OpenRepository(f)
if err != nil {
- qlog.Fatalf("runUpdate.Open repoId: %v", err)
+ log.GitLogger.Fatal("runUpdate.Open repoId: %v", err)
}
newCommit, err := repo.GetCommit(newCommitId)
if err != nil {
- qlog.Fatalf("runUpdate GetCommit of newCommitId: %v", err)
+ log.GitLogger.Fatal("runUpdate GetCommit of newCommitId: %v", err)
return
}
@@ -51,28 +50,28 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
if isNew {
l, err = newCommit.CommitsBefore()
if err != nil {
- qlog.Fatalf("Find CommitsBefore erro: %v", err)
+ log.GitLogger.Fatal("Find CommitsBefore erro: %v", err)
}
} else {
l, err = newCommit.CommitsBeforeUntil(oldCommitId)
if err != nil {
- qlog.Fatalf("Find CommitsBeforeUntil erro: %v", err)
+ log.GitLogger.Fatal("Find CommitsBeforeUntil erro: %v", err)
return
}
}
if err != nil {
- qlog.Fatalf("runUpdate.Commit repoId: %v", err)
+ log.GitLogger.Fatal("runUpdate.Commit repoId: %v", err)
}
ru, err := GetUserByName(repoUserName)
if err != nil {
- qlog.Fatalf("runUpdate.GetUserByName: %v", err)
+ log.GitLogger.Fatal("runUpdate.GetUserByName: %v", err)
}
repos, err := GetRepositoryByName(ru.Id, repoName)
if err != nil {
- qlog.Fatalf("runUpdate.GetRepositoryByName userId: %v", err)
+ log.GitLogger.Fatal("runUpdate.GetRepositoryByName userId: %v", err)
}
commits := make([]*base.PushCommit, 0)
@@ -96,6 +95,6 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
//commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()})
if err = CommitRepoAction(userId, ru.Id, userName, actEmail,
repos.Id, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits}); err != nil {
- qlog.Fatalf("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err)
+ log.GitLogger.Fatal("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err)
}
}