go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Code Issues Releases Activity

Rename deletedLineInfo to hunk

Browse Source 
We'll use it with a more general meaning later in this branch.
This commit is contained in:
Stefan Haller
2024-05-19 16:48:43 +02:00
parent f085d10c46
commit a957c5542f
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/gui/controllers/helpers/fixup_helper.go
View File

@ -26,7 +26,7 @@ func NewFixupHelper(
} }
} }
type deletedLineInfo struct { type hunk struct {
filename string filename string
startLineIdx int startLineIdx int
numLines int numLines int
@ -41,12 +41,12 @@ func (self *FixupHelper) HandleFindBaseCommitForFixupPress() error {
return errors.New(self.c.Tr.NoChangedFiles) return errors.New(self.c.Tr.NoChangedFiles)
} }
deletedLineInfos, hasHunksWithOnlyAddedLines := self.parseDiff(diff) deletedLineHunks, hasHunksWithOnlyAddedLines := self.parseDiff(diff)
if len(deletedLineInfos) == 0 { if len(deletedLineHunks) == 0 {
return errors.New(self.c.Tr.NoDeletedLinesInDiff) return errors.New(self.c.Tr.NoDeletedLinesInDiff)
} }
hashes := self.blameDeletedLines(deletedLineInfos) hashes := self.blameDeletedLines(deletedLineHunks)
if len(hashes) == 0 { if len(hashes) == 0 {
// This should never happen // This should never happen
@ -122,20 +122,20 @@ func (self *FixupHelper) getDiff() (string, bool, error) {
return diff, hasStagedChanges, err return diff, hasStagedChanges, err
} }
func (self *FixupHelper) parseDiff(diff string) ([]*deletedLineInfo, bool) { func (self *FixupHelper) parseDiff(diff string) ([]*hunk, bool) {
lines := strings.Split(strings.TrimSuffix(diff, "\n"), "\n") lines := strings.Split(strings.TrimSuffix(diff, "\n"), "\n")
deletedLineInfos := []*deletedLineInfo{} deletedLineHunks := []*hunk{}
hasHunksWithOnlyAddedLines := false hasHunksWithOnlyAddedLines := false
hunkHeaderRegexp := regexp.MustCompile(`@@ -(\d+)(?:,\d+)? \+\d+(?:,\d+)? @@`) hunkHeaderRegexp := regexp.MustCompile(`@@ -(\d+)(?:,\d+)? \+\d+(?:,\d+)? @@`)
var filename string var filename string
var currentLineInfo *deletedLineInfo var currentHunk *hunk
finishHunk := func() { finishHunk := func() {
if currentLineInfo != nil { if currentHunk != nil {
if currentLineInfo.numLines > 0 { if currentHunk.numLines > 0 {
deletedLineInfos = append(deletedLineInfos, currentLineInfo) deletedLineHunks = append(deletedLineHunks, currentHunk)
} else { } else {
hasHunksWithOnlyAddedLines = true hasHunksWithOnlyAddedLines = true
} }
@ -144,7 +144,7 @@ func (self *FixupHelper) parseDiff(diff string) ([]*deletedLineInfo, bool) {
for _, line := range lines { for _, line := range lines {
if strings.HasPrefix(line, "diff --git") { if strings.HasPrefix(line, "diff --git") {
finishHunk() finishHunk()
currentLineInfo = nil currentHunk = nil
} else if strings.HasPrefix(line, "--- ") { } else if strings.HasPrefix(line, "--- ") {
// For some reason, the line ends with a tab character if the file // For some reason, the line ends with a tab character if the file
// name contains spaces // name contains spaces
@ -153,36 +153,36 @@ func (self *FixupHelper) parseDiff(diff string) ([]*deletedLineInfo, bool) {
finishHunk() finishHunk()
match := hunkHeaderRegexp.FindStringSubmatch(line) match := hunkHeaderRegexp.FindStringSubmatch(line)
startIdx := utils.MustConvertToInt(match[1]) startIdx := utils.MustConvertToInt(match[1])
currentLineInfo = &deletedLineInfo{filename, startIdx, 0} currentHunk = &hunk{filename, startIdx, 0}
} else if currentLineInfo != nil && line[0] == '-' { } else if currentHunk != nil && line[0] == '-' {
currentLineInfo.numLines++ currentHunk.numLines++
} }
} }
finishHunk() finishHunk()
return deletedLineInfos, hasHunksWithOnlyAddedLines return deletedLineHunks, hasHunksWithOnlyAddedLines
} }
// returns the list of commit hashes that introduced the lines which have now been deleted // returns the list of commit hashes that introduced the lines which have now been deleted
func (self *FixupHelper) blameDeletedLines(deletedLineInfos []*deletedLineInfo) []string { func (self *FixupHelper) blameDeletedLines(deletedLineHunks []*hunk) []string {
var wg sync.WaitGroup var wg sync.WaitGroup
hashChan := make(chan string) hashChan := make(chan string)
for _, info := range deletedLineInfos { for _, h := range deletedLineHunks {
wg.Add(1) wg.Add(1)
go func(info *deletedLineInfo) { go func(h *hunk) {
defer wg.Done() defer wg.Done()
blameOutput, err := self.c.Git().Blame.BlameLineRange(info.filename, "HEAD", info.startLineIdx, info.numLines) blameOutput, err := self.c.Git().Blame.BlameLineRange(h.filename, "HEAD", h.startLineIdx, h.numLines)
if err != nil { if err != nil {
self.c.Log.Errorf("Error blaming file '%s': %v", info.filename, err) self.c.Log.Errorf("Error blaming file '%s': %v", h.filename, err)
return return
} }
blameLines := strings.Split(strings.TrimSuffix(blameOutput, "\n"), "\n") blameLines := strings.Split(strings.TrimSuffix(blameOutput, "\n"), "\n")
for _, line := range blameLines { for _, line := range blameLines {
hashChan <- strings.Split(line, " ")[0] hashChan <- strings.Split(line, " ")[0]
} }
}(info) }(h)
} }
go func() { go func() {