|
|
|
@ -28,8 +28,8 @@ type PushCommit struct { |
|
|
|
|
|
|
|
|
|
// PushCommits represents list of commits in a push operation.
|
|
|
|
|
type PushCommits struct { |
|
|
|
|
Len int |
|
|
|
|
Commits []*PushCommit |
|
|
|
|
HeadCommit *PushCommit |
|
|
|
|
CompareURL string |
|
|
|
|
|
|
|
|
|
avatars map[string]string |
|
|
|
@ -44,16 +44,9 @@ func NewPushCommits() *PushCommits { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// ToAPIPayloadCommits converts a PushCommits object to
|
|
|
|
|
// api.PayloadCommit format.
|
|
|
|
|
func (pc *PushCommits) ToAPIPayloadCommits(repoPath, repoLink string) ([]*api.PayloadCommit, error) { |
|
|
|
|
commits := make([]*api.PayloadCommit, len(pc.Commits)) |
|
|
|
|
|
|
|
|
|
if pc.emailUsers == nil { |
|
|
|
|
pc.emailUsers = make(map[string]*models.User) |
|
|
|
|
} |
|
|
|
|
// toAPIPayloadCommit converts a single PushCommit to an api.PayloadCommit object.
|
|
|
|
|
func (pc *PushCommits) toAPIPayloadCommit(repoPath, repoLink string, commit *PushCommit) (*api.PayloadCommit, error) { |
|
|
|
|
var err error |
|
|
|
|
for i, commit := range pc.Commits { |
|
|
|
|
authorUsername := "" |
|
|
|
|
author, ok := pc.emailUsers[commit.AuthorEmail] |
|
|
|
|
if !ok { |
|
|
|
@ -84,7 +77,7 @@ func (pc *PushCommits) ToAPIPayloadCommits(repoPath, repoLink string) ([]*api.Pa |
|
|
|
|
return nil, fmt.Errorf("FileStatus [commit_sha1: %s]: %v", commit.Sha1, err) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
commits[i] = &api.PayloadCommit{ |
|
|
|
|
return &api.PayloadCommit{ |
|
|
|
|
ID: commit.Sha1, |
|
|
|
|
Message: commit.Message, |
|
|
|
|
URL: fmt.Sprintf("%s/commit/%s", repoLink, commit.Sha1), |
|
|
|
@ -102,9 +95,37 @@ func (pc *PushCommits) ToAPIPayloadCommits(repoPath, repoLink string) ([]*api.Pa |
|
|
|
|
Removed: fileStatus.Removed, |
|
|
|
|
Modified: fileStatus.Modified, |
|
|
|
|
Timestamp: commit.Timestamp, |
|
|
|
|
}, nil |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// ToAPIPayloadCommits converts a PushCommits object to api.PayloadCommit format.
|
|
|
|
|
// It returns all converted commits and, if provided, the head commit or an error otherwise.
|
|
|
|
|
func (pc *PushCommits) ToAPIPayloadCommits(repoPath, repoLink string) ([]*api.PayloadCommit, *api.PayloadCommit, error) { |
|
|
|
|
commits := make([]*api.PayloadCommit, len(pc.Commits)) |
|
|
|
|
var headCommit *api.PayloadCommit |
|
|
|
|
|
|
|
|
|
if pc.emailUsers == nil { |
|
|
|
|
pc.emailUsers = make(map[string]*models.User) |
|
|
|
|
} |
|
|
|
|
for i, commit := range pc.Commits { |
|
|
|
|
apiCommit, err := pc.toAPIPayloadCommit(repoPath, repoLink, commit) |
|
|
|
|
if err != nil { |
|
|
|
|
return nil, nil, err |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
commits[i] = apiCommit |
|
|
|
|
if pc.HeadCommit != nil && pc.HeadCommit.Sha1 == commits[i].ID { |
|
|
|
|
headCommit = apiCommit |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return commits, nil |
|
|
|
|
if pc.HeadCommit != nil && headCommit == nil { |
|
|
|
|
var err error |
|
|
|
|
headCommit, err = pc.toAPIPayloadCommit(repoPath, repoLink, pc.HeadCommit) |
|
|
|
|
if err != nil { |
|
|
|
|
return nil, nil, err |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return commits, headCommit, nil |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// AvatarLink tries to match user in database with e-mail
|
|
|
|
@ -157,13 +178,9 @@ func CommitToPushCommit(commit *git.Commit) *PushCommit { |
|
|
|
|
// ListToPushCommits transforms a list.List to PushCommits type.
|
|
|
|
|
func ListToPushCommits(l *list.List) *PushCommits { |
|
|
|
|
var commits []*PushCommit |
|
|
|
|
var actEmail string |
|
|
|
|
for e := l.Front(); e != nil; e = e.Next() { |
|
|
|
|
commit := e.Value.(*git.Commit) |
|
|
|
|
if actEmail == "" { |
|
|
|
|
actEmail = commit.Committer.Email |
|
|
|
|
} |
|
|
|
|
commits = append(commits, CommitToPushCommit(commit)) |
|
|
|
|
commit := CommitToPushCommit(e.Value.(*git.Commit)) |
|
|
|
|
commits = append(commits, commit) |
|
|
|
|
} |
|
|
|
|
return &PushCommits{l.Len(), commits, "", make(map[string]string), make(map[string]*models.User)} |
|
|
|
|
return &PushCommits{commits, nil, "", make(map[string]string), make(map[string]*models.User)} |
|
|
|
|
} |
|
|
|
|