Add git branches data

Signed-off-by: Łukasz Gryglicki <[email protected]>

Author: lukaszgryglicki

cmd/git/git.go

@@ -549,6 +549,7 @@ type DSGit struct {
 	OrphanedCommits []string                          // orphaned commits SHAs
 	OrphanedMap     map[string]struct{}               // orphaned commits SHAs
 	DefaultBranch   string                            // default branch name, example: master, main
+	Branches        map[string]struct{}               // all branches
 	// PairProgramming mode
 	PairProgramming bool
 	// CommitsHash is a map of commit hashes for each repo
@@ -871,6 +872,11 @@ func (j *DSGit) EnrichItem(ctx *shared.Ctx, item map[string]interface{}) (rich m
 		rich["message_analyzed"] = nil
 		rich["message"] = nil
 	}
+	iBranch, _ := commit["branch"]
+	branch, _ := iBranch.(string)
+	rich["branch"] = branch
+	rich["default_branch"] = j.DefaultBranch
+	rich["is_default_branch"] = j.DefaultBranch == branch
 	comm, ok := shared.Dig(commit, []string{"commit"}, false, true)
 	var hsh string
 	if ok {
@@ -1078,6 +1084,8 @@ func (j *DSGit) GetModelData(ctx *shared.Ctx, docs []interface{}) []insights.Com
 		doc, _ := iDoc.(map[string]interface{})
 		commit.URL, _ = doc["commit_url"].(string)
 		commit.SHA, _ = doc["hash"].(string)
+		commit.Branch, _ = doc["branch"].(string)
+		commit.DefaultBranch, _ = doc["is_default_branch"].(bool)
 		commit.ShortHash, _ = doc["hash_short"].(string)
 		commit.Source, _ = doc["commit_repo_type"].(string)
 		commit.Message, _ = doc["message"].(string)
@@ -1413,6 +1421,7 @@ func (j *DSGit) GetGitBranches(ctx *shared.Ctx) (err error) {
 		shared.Printf("git branch data for %s: %s\n", j.URL, sout)
 	}
 	ary := strings.Split(sout, "\n")
+	j.Branches = make(map[string]struct{})
 	for _, branch := range ary {
 		branch := strings.TrimSpace(branch)
 		if branch == "" {
@@ -1421,13 +1430,17 @@ func (j *DSGit) GetGitBranches(ctx *shared.Ctx) (err error) {
 		if ctx.Debug > 1 {
 			shared.Printf("branch: '%s'\n", branch)
 		}
-		if branch[:1] == "*" {
+		if strings.HasPrefix(branch, "* ") {
 			branch = branch[2:]
 			if ctx.Debug > 0 {
 				shared.Printf("Default branch: '%s'\n", branch)
 			}
 			j.DefaultBranch = branch
 		}
+		j.Branches[branch] = struct{}{}
+	}
+	if ctx.Debug > 0 {
+		shared.Printf("Branches: %v\n", j.Branches)
 	}
 	return
 }
@@ -1437,6 +1450,8 @@ func (j *DSGit) ParseGitLog(ctx *shared.Ctx) (cmd *exec.Cmd, err error) {
 	if ctx.Debug > 0 {
 		shared.Printf("parsing logs from %s\n", j.GitPath)
 	}
+	// Example full command line:
+	// LANG=C PAGER='' git log --reverse --topo-order --branches --tags --remotes=origin --no-color --decorate --raw --numstat --pretty=fuller --decorate=full --parents -M -C -c
 	cmdLine := []string{"git", "log", "--reverse", "--topo-order", "--branches", "--tags", "--remotes=origin"}
 	cmdLine = append(cmdLine, GitLogOptions...)
 	if ctx.DateFrom != nil {
@@ -1722,12 +1737,44 @@ func (j *DSGit) GitEnrichItems(ctx *shared.Ctx, thrN int, items []interface{}, d
 }
 
 // GetCommitBranch - get commit branch from refs
-func (j *DSGit) GetCommitBranch(refs []string) string {
+func (j *DSGit) GetCommitBranch(ctx *shared.Ctx, refs []string) (branch string) {
 	// ref can be:
 	// tag: refs/tags/0.9.0
 	// refs/heads/DA-2371-prod
 	// HEAD -> unicron-add-branches, origin/main, origin/HEAD, main
-	return refs[0]
+	// origin/main, origin/HEAD, main
+	tag := ""
+	for _, ref := range refs {
+		isTag := false
+		if strings.HasPrefix(ref, "tag: ") {
+			isTag = true
+			ref = ref[5:]
+		}
+		ary := strings.Split(ref, " -> ")
+		if len(ary) > 0 {
+			ref = ary[len(ary)-1]
+		}
+		ref = strings.Replace(ref, "origin/", "", 1)
+		ref = strings.Replace(ref, "refs/heads/", "", 1)
+		if isTag == true {
+			tag = ref
+			continue
+		}
+		if ref == j.DefaultBranch {
+			continue
+		}
+		branch = ref
+	}
+	if branch == "" && tag != "" {
+		branch = tag
+	}
+	if branch == "" {
+		branch = j.DefaultBranch
+	}
+	if ctx.Debug > 1 {
+		shared.Printf("Branch: %+v -> %s\n", refs, branch)
+	}
+	return
 }
 
 // ParseCommit - parse commit
@@ -1758,7 +1805,7 @@ func (j *DSGit) ParseCommit(ctx *shared.Ctx, line string) (parsed bool, err erro
 	j.Commit["parents"] = parentsAry
 	j.Commit["refs"] = refsAry
 	if len(refsAry) > 0 {
-		j.Commit["branch"] = j.GetCommitBranch(refsAry)
+		j.Commit["branch"] = j.GetCommitBranch(ctx, refsAry)
 	} else {
 		j.Commit["branch"] = j.DefaultBranch
 	}

scripts/example_run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ ! -z "$CONSOLE" ]
 then
-  GIT_TAGS="c,d,e" ./scripts/git.sh --git-url='https://github.com/LF-engineering/dev-analytics-api' --git-date-from "2015-01" --git-date-to "2022-01" --git-pack-size=100 --git-tags="a,b,c" --git-project=Kubernetes --git-skip-cache-cleanup=1 --git-stream='' $*
+  GIT_TAGS="c,d,e" ./scripts/git.sh --git-url='https://github.com/LF-engineering/insights-datasource-git' --git-date-from "2015-01" --git-date-to "2023-01" --git-pack-size=100 --git-tags="a,b,c" --git-project=Kubernetes --git-skip-cache-cleanup=1 --git-stream='' $*
 else
-  GIT_TAGS="c,d,e" ./scripts/git.sh --git-url='https://github.com/LF-engineering/dev-analytics-affiliation' --git-date-from "2015-01" --git-date-to "2022-01" --git-pack-size=100 --git-tags="a,b,c" --git-project=Kubernetes --git-skip-cache-cleanup=1 $*
+  GIT_TAGS="c,d,e" ./scripts/git.sh --git-url='https://github.com/LF-engineering/insights-datasource-git' --git-date-from "2015-01" --git-date-to "2023-01" --git-pack-size=100 --git-tags="a,b,c" --git-project=Kubernetes --git-skip-cache-cleanup=1 $*
 fi