mirrors/git-validation
1
0
Fork 0
mirror of https://github.com/vbatts/git-validation.git synced 2024-12-28 16:26:31 +00:00
Code Releases Activity

git: switch out the field names usage

Browse source 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2016-04-01 16:47:39 -04:00
parent 3ec88517cc
commit 78001eac99
1 changed files with 7 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
git/commits.go
View file

@ -2,9 +2,6 @@ package git
import ( import (
"bytes" "bytes"
"encoding/json"
"fmt"
"log"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
@ -16,7 +13,7 @@ import (
// If commitrange is a git still range 12345...54321, then it will be isolated set of commits. // If commitrange is a git still range 12345...54321, then it will be isolated set of commits.
// If commitrange is a single commit, all ancestor commits up through the hash provided. // If commitrange is a single commit, all ancestor commits up through the hash provided.
func Commits(commitrange string) ([]CommitEntry, error) { func Commits(commitrange string) ([]CommitEntry, error) {
cmdArgs := []string{"git", "log", prettyFormat + formatCommit, commitrange} cmdArgs := []string{"git", "log", `--pretty=format:%H`, commitrange}
if debug() { if debug() {
logrus.Infof("[git] cmd: %q", strings.Join(cmdArgs, " ")) logrus.Infof("[git] cmd: %q", strings.Join(cmdArgs, " "))
} }
@ -65,58 +62,18 @@ var FieldNames = map[string]string{
// See also FieldNames // See also FieldNames
type CommitEntry map[string]string type CommitEntry map[string]string
var (
prettyFormat = `--pretty=format:`
formatAuthorEmail = `%aE`
formatAuthorName = `%aN`
formatBody = `%b`
formatCommit = `%H`
formatCommitNotes = `%N`
formatCommitterEmail = `%cE`
formatCommitterName = `%cN`
formatSigner = `%GS`
formatSubject = `%s`
formatMap = `{"commit": "%H", "abbreviated_commit": "%h", "tree": "%T", "abbreviated_tree": "%t", "parent": "%P", "abbreviated_parent": "%p", "refs": "%D", "encoding": "%e", "sanitized_subject_line": "%f", "verification_flag": "%G?", "signer_key": "%GK", "author_date": "%aD" , "committer_date": "%cD" }`
)
// LogCommit assembles the full information on a commit from its commit hash // LogCommit assembles the full information on a commit from its commit hash
func LogCommit(commit string) (*CommitEntry, error) { func LogCommit(commit string) (*CommitEntry, error) {
buf := bytes.NewBuffer([]byte{}) buf := bytes.NewBuffer([]byte{})
cmdArgs := []string{"git", "log", "-1", prettyFormat + formatMap, commit} c := CommitEntry{}
if debug() { for k, v := range FieldNames {
logrus.Infof("[git] cmd: %q", strings.Join(cmdArgs, " ")) cmd := exec.Command("git", "log", "-1", `--pretty=format:`+k+``, commit)
}
cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
cmd.Stdout = buf cmd.Stdout = buf
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Println(strings.Join(cmd.Args, " "))
return nil, err return nil, err
} }
c := CommitEntry{} c[v] = strings.TrimSpace(string(buf.Bytes()))
output := buf.Bytes()
if err := json.Unmarshal(output, &c); err != nil {
fmt.Println(string(output))
return nil, err
}
// any user provided fields can't be sanitized for the mock-json marshal above
for k, v := range map[string]string{
"subject": formatSubject,
"body": formatBody,
"author_name": formatAuthorName,
"author_email": formatAuthorEmail,
"committer_name": formatCommitterName,
"committer_email": formatCommitterEmail,
"commit_notes": formatCommitNotes,
"signer": formatSigner,
} {
output, err := exec.Command("git", "log", "-1", prettyFormat+v, commit).Output()
if err != nil {
return nil, err
}
c[k] = strings.TrimSpace(string(output))
} }
return &c, nil return &c, nil