aboutsummaryrefslogtreecommitdiff
path: root/internal/db/action.go
diff options
context:
space:
mode:
authorᴜɴᴋɴᴡᴏɴ <u@gogs.io>2020-03-08 19:09:31 +0800
committerGitHub <noreply@github.com>2020-03-08 19:09:31 +0800
commit6437d0180b97a26319b50c2e22927dac7c94fcdd (patch)
tree3d0d097e7f498e4b970065096e7500876d365a8b /internal/db/action.go
parentc65b5b9f84dee21dc362311b299694e8e00f6ac6 (diff)
git: migrate to github.com/gogs/git-module@v1.0.0 (#5958)
* WIP * Finish `internal/db/git_diff.go` * FInish internal/db/mirror.go * Finish internal/db/pull.go * Finish internal/db/release.go * Finish internal/db/repo.go * Finish internal/db/repo_branch.go * Finish internal/db/repo_editor.go * Finish internal/db/update.go * Save my work * Add license header * Compile! * Merge master * Finish internal/cmd/hook.go * Finish internal/conf/static.go * Finish internal/context/repo.go * Finish internal/db/action.go * Finish internal/db/git_diff.go * Fix submodule URL inferring * Finish internal/db/mirror.go * Updat to beta.4 * css: update fonts * Finish internal/db/pull.go * Finish internal/db/release.go * Finish internal/db/repo_branch.go * Finish internal/db/wiki.go * gitutil: enhance infer submodule UR * Finish internal/route/api/v1/repo/commits.go * mirror: only collect branch commits after sync * mirror: fix tag support * Finish internal/db/repo.go * Finish internal/db/repo_editor.go * Finish internal/db/update.go * Finish internal/gitutil/pull_request.go * Make it compile * Finish internal/route/repo/setting.go * Finish internal/route/repo/branch.go * Finish internal/route/api/v1/repo/file.go * Finish internal/route/repo/download.go * Finish internal/route/repo/editor.go * Use helper * Finish internal/route/repo/issue.go * Finish internal/route/repo/pull.go * Finish internal/route/repo/release.go * Finish internal/route/repo/repo.go * Finish internal/route/repo/wiki.go * Finish internal/route/repo/commit.go * Finish internal/route/repo/view.go * Finish internal/gitutil/tag.go * go.sum
Diffstat (limited to 'internal/db/action.go')
-rw-r--r--internal/db/action.go28
1 files changed, 14 insertions, 14 deletions
diff --git a/internal/db/action.go b/internal/db/action.go
index 3fe56dd1..0b803836 100644
--- a/internal/db/action.go
+++ b/internal/db/action.go
@@ -268,9 +268,9 @@ func (pc *PushCommits) ToApiPayloadCommits(repoPath, repoURL string) ([]*api.Pay
return nil, fmt.Errorf("GetUserByEmail: %v", err)
}
- fileStatus, err := git.GetCommitFileStatus(repoPath, commit.Sha1)
+ nameStatus, err := git.RepoShowNameStatus(repoPath, commit.Sha1)
if err != nil {
- return nil, fmt.Errorf("FileStatus [commit_sha1: %s]: %v", commit.Sha1, err)
+ return nil, fmt.Errorf("show name status [commit_sha1: %s]: %v", commit.Sha1, err)
}
commits[i] = &api.PayloadCommit{
@@ -287,9 +287,9 @@ func (pc *PushCommits) ToApiPayloadCommits(repoPath, repoURL string) ([]*api.Pay
Email: commit.CommitterEmail,
UserName: committerUsername,
},
- Added: fileStatus.Added,
- Removed: fileStatus.Removed,
- Modified: fileStatus.Modified,
+ Added: nameStatus.Added,
+ Removed: nameStatus.Removed,
+ Modified: nameStatus.Modified,
Timestamp: commit.Timestamp,
}
}
@@ -298,21 +298,21 @@ func (pc *PushCommits) ToApiPayloadCommits(repoPath, repoURL string) ([]*api.Pay
// AvatarLink tries to match user in database with e-mail
// in order to show custom avatar, and falls back to general avatar link.
-func (push *PushCommits) AvatarLink(email string) string {
- _, ok := push.avatars[email]
+func (pcs *PushCommits) AvatarLink(email string) string {
+ _, ok := pcs.avatars[email]
if !ok {
u, err := GetUserByEmail(email)
if err != nil {
- push.avatars[email] = tool.AvatarLink(email)
+ pcs.avatars[email] = tool.AvatarLink(email)
if !errors.IsUserNotExist(err) {
log.Error("GetUserByEmail: %v", err)
}
} else {
- push.avatars[email] = u.RelAvatarLink()
+ pcs.avatars[email] = u.RelAvatarLink()
}
}
- return push.avatars[email]
+ return pcs.avatars[email]
}
// UpdateIssuesCommit checks if issues are manipulated by commit message.
@@ -474,12 +474,12 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
return fmt.Errorf("UpdateRepository: %v", err)
}
- isNewRef := opts.OldCommitID == git.EMPTY_SHA
- isDelRef := opts.NewCommitID == git.EMPTY_SHA
+ isNewRef := opts.OldCommitID == git.EmptyID
+ isDelRef := opts.NewCommitID == git.EmptyID
opType := ACTION_COMMIT_REPO
// Check if it's tag push or branch.
- if strings.HasPrefix(opts.RefFullName, git.TAG_PREFIX) {
+ if strings.HasPrefix(opts.RefFullName, git.RefsTags) {
opType = ACTION_PUSH_TAG
} else {
// if not the first commit, set the compare URL.
@@ -504,7 +504,7 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
return fmt.Errorf("Marshal: %v", err)
}
- refName := git.RefEndName(opts.RefFullName)
+ refName := git.RefShortName(opts.RefFullName)
action := &Action{
ActUserID: pusher.ID,
ActUserName: pusher.Name,