fix AllFilesDetails

Author: xhd2015

git/diff.go

@@ -61,6 +61,9 @@ func NewGitDiff(dir string, oldCommit string, newCommit string) *GitDiff {
 func (c *GitDiff) AllFiles() ([]string, error) {
 	return c.newGit.ListFiles()
 }
+
+// AllFilesDetails deprecated, it has bug.
+// use AllFilesDetailsV2 instead
 func (c *GitDiff) AllFilesDetails() (map[string]*FileDetail, error) {
 	c.fileDetailsOnce.Do(func() {
 		allFiles, err := c.AllFiles()
@@ -106,6 +109,53 @@ func (c *GitDiff) AllFilesDetails() (map[string]*FileDetail, error) {
 	return c.fileDetails, c.fileDetailsErr
 }
 
+func (c *GitDiff) AllFilesDetailsV2() (map[string]*FileDetail, error) {
+	c.fileDetailsOnce.Do(func() {
+		allFiles, err := c.AllFiles()
+		if err != nil {
+			c.fileDetailsErr = fmt.Errorf("get all files err:%v", err)
+			return
+		}
+		updates, err := c.GetUpdates()
+		if err != nil {
+			c.fileDetailsErr = fmt.Errorf("get updates err:%v", err)
+			return
+		}
+		added, err := c.GetNew()
+		if err != nil {
+			c.fileDetailsErr = fmt.Errorf("get added err:%v", err)
+			return
+		}
+		updateMap := make(map[string]bool, len(updates))
+		for _, file := range updates {
+			updateMap[file] = true
+		}
+
+		addedMap := make(map[string]bool, len(added))
+		for _, file := range added {
+			addedMap[file] = true
+		}
+
+		fileDetailsMap := make(map[string]*FileDetail, len(allFiles))
+		for _, file := range allFiles {
+			fileDetailsMap[file] = &FileDetail{
+				IsNew:          addedMap[file],
+				ContentChanged: updateMap[file],
+			}
+		}
+		err = FindRenamesV2(c.dir, c.oldCommit, c.newCommit, func(newFile, oldFile, percent string) {
+			d := fileDetailsMap[newFile]
+			d.RenamedFrom = oldFile
+			d.ContentChanged = d.ContentChanged || percent != "100%"
+		})
+		if err != nil {
+			c.fileDetailsErr = fmt.Errorf("get rename files err:%v", err)
+			return
+		}
+		c.fileDetails = fileDetailsMap
+	})
+	return c.fileDetails, c.fileDetailsErr
+}
 func (c *GitDiff) GetUpdateAndRenames() (newToOld map[string]string, err error) {
 	c.mergeOnce.Do(func() {
 		renames, err := c.GetRenames()

git/git.go

@@ -15,6 +15,10 @@ func FindRenames(dir string, oldCommit string, newCommit string) (map[string]str
 	repo := &GitRepo{Dir: dir}
 	return repo.FindRenames(oldCommit, newCommit)
 }
+func FindRenamesV2(dir string, oldCommit string, newCommit string, fn func(newFile string, oldFile string, percent string)) error {
+	repo := &GitRepo{Dir: dir}
+	return repo.FindRenamesV2(oldCommit, newCommit, fn)
+}
 
 func FindUpdate(dir string, oldCommit string, newCommit string) ([]string, error) {
 	repo := &GitRepo{Dir: dir}
@@ -121,6 +125,89 @@ func (c *GitRepo) FindRenames(oldCommit string, newCommit string) (map[string]st
 	return m, nil
 }
 
+func (c *GitRepo) FindRenamesV2(oldCommit string, newCommit string, fn func(newFile string, oldFile string, percent string)) error {
+	cmd := fmt.Sprintf(`git -C %s diff --diff-filter=R --summary %s %s || true`, sh.Quote(c.Dir), sh.Quote(getRef(oldCommit)), sh.Quote(getRef(newCommit)))
+	stdout, stderr, err := sh.RunBashCmdOpts(cmd, sh.RunBashOptions{
+		// Verbose:    true,
+		NeedStdOut: true,
+		// NeedStdErr: true,
+	})
+	// fmt.Printf("stderr:%v", stderr)
+	_ = stderr
+	if err != nil {
+		return err
+	}
+	parseRenames(stdout, fn)
+	return nil
+}
+
+func parseRenames(renamedFilesWithSummary string, fn func(newFile string, oldFile string, percent string)) {
+	renames := splitLinesFilterEmpty(renamedFilesWithSummary)
+	for _, line := range renames {
+		line = strings.TrimSpace(line)
+		if !strings.HasPrefix(line, "rename ") {
+			continue
+		}
+		s := strings.TrimSpace(line[len("rename "):])
+
+		// parse percent
+		//  rename src/{module_funder/id/submodule_funder_seabank/cl => module_funder_bke/id}/bcl/task/repair_clawback_task.go (64%)
+		var percent string
+		pEidx := strings.LastIndex(s, ")")
+		if pEidx >= 0 {
+			s = strings.TrimSpace(s[:pEidx])
+			pIdx := strings.LastIndex(s, "(")
+			if pIdx >= 0 {
+				percent = strings.TrimSpace(s[pIdx+1:])
+				s = strings.TrimSpace(s[:pIdx])
+			}
+		}
+
+		bIdx := strings.Index(s, "{")
+		if bIdx < 0 {
+			continue
+		}
+		bEIdx := strings.LastIndex(s, "}")
+		if bEIdx < 0 {
+			continue
+		}
+		prefix := s[:bIdx]
+		var suffix string
+		if bEIdx+1 < len(s) {
+			suffix = s[bEIdx+1:]
+		}
+		s = s[bIdx+1 : bEIdx]
+		sep := " => "
+		toIdx := strings.Index(s, sep)
+		if toIdx < 0 {
+			continue
+		}
+		oldPath := s[:toIdx]
+		var newPath string
+		if toIdx+len(sep) < len(s) {
+			newPath = s[toIdx+len(sep):]
+		}
+
+		file := joinPath(prefix, newPath, suffix)
+		oldFile := joinPath(prefix, oldPath, suffix)
+
+		fn(file, oldFile, percent)
+	}
+}
+
+func joinPath(p ...string) string {
+	j := 0
+	for i := 0; i < len(p); i++ {
+		e := strings.TrimPrefix(p[i], "/")
+		e = strings.TrimSuffix(e, "/")
+		if e != "" {
+			p[j] = e
+			j++
+		}
+	}
+	return strings.Join(p[:j], "/")
+}
+
 type GitSnapshot struct {
 	Dir    string
 	Commit string