fixup! Store fromHash/toHash in Pipe struct as pointers

Author: stefanhaller

pkg/gui/context/local_commits_context.go

@@ -32,12 +32,12 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 	)
 
 	getDisplayStrings := func(startIdx int, endIdx int) [][]string {
-		var selectedCommitHash *string
+		var selectedCommitHashPtr *string
 
 		if c.Context().Current().GetKey() == LOCAL_COMMITS_CONTEXT_KEY {
 			selectedCommit := viewModel.GetSelected()
 			if selectedCommit != nil {
-				selectedCommitHash = selectedCommit.HashPtr()
+				selectedCommitHashPtr = selectedCommit.HashPtr()
 			}
 		}
 
@@ -57,7 +57,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 			c.UserConfig().Gui.ShortTimeFormat,
 			time.Now(),
 			c.UserConfig().Git.ParseEmoji,
-			selectedCommitHash,
+			selectedCommitHashPtr,
 			startIdx,
 			endIdx,
 			shouldShowGraph(c),

pkg/gui/context/sub_commits_context.go

@@ -46,11 +46,11 @@ func NewSubCommitsContext(
 			return [][]string{}
 		}
 
-		var selectedCommitHash *string
+		var selectedCommitHashPtr *string
 		if c.Context().Current().GetKey() == SUB_COMMITS_CONTEXT_KEY {
 			selectedCommit := viewModel.GetSelected()
 			if selectedCommit != nil {
-				selectedCommitHash = selectedCommit.HashPtr()
+				selectedCommitHashPtr = selectedCommit.HashPtr()
 			}
 		}
 		branches := []*models.Branch{}
@@ -72,7 +72,7 @@ func NewSubCommitsContext(
 			c.UserConfig().Gui.ShortTimeFormat,
 			time.Now(),
 			c.UserConfig().Git.ParseEmoji,
-			selectedCommitHash,
+			selectedCommitHashPtr,
 			startIdx,
 			endIdx,
 			shouldShowGraph(c),

pkg/gui/presentation/commits.go

@@ -51,7 +51,7 @@ func GetCommitListDisplayStrings(
 	shortTimeFormat string,
 	now time.Time,
 	parseEmoji bool,
-	selectedCommitHash *string,
+	selectedCommitHashPtr *string,
 	startIdx int,
 	endIdx int,
 	showGraph bool,
@@ -102,7 +102,7 @@ func GetCommitListDisplayStrings(
 					graphLines := graph.RenderAux(
 						graphPipeSets,
 						graphCommits,
-						selectedCommitHash,
+						selectedCommitHashPtr,
 					)
 					allGraphLines = append(allGraphLines, graphLines...)
 				}
@@ -119,7 +119,7 @@ func GetCommitListDisplayStrings(
 					graphLines := graph.RenderAux(
 						graphPipeSets,
 						graphCommits,
-						selectedCommitHash,
+						selectedCommitHashPtr,
 					)
 					allGraphLines = append(allGraphLines, graphLines...)
 				}
@@ -140,7 +140,7 @@ func GetCommitListDisplayStrings(
 			graphLines := graph.RenderAux(
 				graphPipeSets,
 				graphCommits,
-				selectedCommitHash,
+				selectedCommitHashPtr,
 			)
 			getGraphLine = func(idx int) string {
 				if idx >= graphOffset {

pkg/gui/presentation/commits_test.go

@@ -36,7 +36,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 		shortTimeFormat           string
 		now                       time.Time
 		parseEmoji                bool
-		selectedCommitHash        *string
+		selectedCommitHashPtr     *string
 		startIdx                  int
 		endIdx                    int
 		showGraph                 bool
@@ -563,7 +563,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 					s.shortTimeFormat,
 					s.now,
 					s.parseEmoji,
-					s.selectedCommitHash,
+					s.selectedCommitHashPtr,
 					s.startIdx,
 					s.endIdx,
 					s.showGraph,

pkg/gui/presentation/graph/graph.go

@@ -45,13 +45,13 @@ func (self Pipe) right() int {
 	return max(self.fromPos, self.toPos)
 }
 
-func RenderCommitGraph(commits []*models.Commit, selectedCommitHash *string, getStyle func(c *models.Commit) style.TextStyle) []string {
+func RenderCommitGraph(commits []*models.Commit, selectedCommitHashPtr *string, getStyle func(c *models.Commit) style.TextStyle) []string {
 	pipeSets := GetPipeSets(commits, getStyle)
 	if len(pipeSets) == 0 {
 		return nil
 	}
 
-	lines := RenderAux(pipeSets, commits, selectedCommitHash)
+	lines := RenderAux(pipeSets, commits, selectedCommitHashPtr)
 
 	return lines
 }
@@ -69,7 +69,7 @@ func GetPipeSets(commits []*models.Commit, getStyle func(c *models.Commit) style
 	})
 }
 
-func RenderAux(pipeSets [][]*Pipe, commits []*models.Commit, selectedCommitHash *string) []string {
+func RenderAux(pipeSets [][]*Pipe, commits []*models.Commit, selectedCommitHashPtr *string) []string {
 	maxProcs := runtime.GOMAXPROCS(0)
 
 	// splitting up the rendering of the graph into multiple goroutines allows us to render the graph in parallel
@@ -93,7 +93,7 @@ func RenderAux(pipeSets [][]*Pipe, commits []*models.Commit, selectedCommitHash
 				if k > 0 {
 					prevCommit = commits[k-1]
 				}
-				line := renderPipeSet(pipeSet, selectedCommitHash, prevCommit)
+				line := renderPipeSet(pipeSet, selectedCommitHashPtr, prevCommit)
 				innerLines = append(innerLines, line)
 			}
 			chunks[i] = innerLines
@@ -272,7 +272,7 @@ func getNextPipes(prevPipes []*Pipe, commit *models.Commit, getStyle func(c *mod
 
 func renderPipeSet(
 	pipes []*Pipe,
-	selectedCommitHash *string,
+	selectedCommitHashPtr *string,
 	prevCommit *models.Commit,
 ) string {
 	maxPos := 0
@@ -319,10 +319,10 @@ func renderPipeSet(
 	// we don't want to highlight two commits if they're contiguous. We only want
 	// to highlight multiple things if there's an actual visible pipe involved.
 	highlight := true
-	if prevCommit != nil && equalHashes(prevCommit.HashPtr(), selectedCommitHash) {
+	if prevCommit != nil && equalHashes(prevCommit.HashPtr(), selectedCommitHashPtr) {
 		highlight = false
 		for _, pipe := range pipes {
-			if equalHashes(pipe.fromHash, selectedCommitHash) && (pipe.kind != TERMINATES || pipe.fromPos != pipe.toPos) {
+			if equalHashes(pipe.fromHash, selectedCommitHashPtr) && (pipe.kind != TERMINATES || pipe.fromPos != pipe.toPos) {
 				highlight = true
 			}
 		}
@@ -331,7 +331,7 @@ func renderPipeSet(
 	// so we have our commit pos again, now it's time to build the cells.
 	// we'll handle the one that's sourced from our selected commit last so that it can override the other cells.
 	selectedPipes, nonSelectedPipes := utils.Partition(pipes, func(pipe *Pipe) bool {
-		return highlight && equalHashes(pipe.fromHash, selectedCommitHash)
+		return highlight && equalHashes(pipe.fromHash, selectedCommitHashPtr)
 	})
 
 	for _, pipe := range nonSelectedPipes {
@@ -375,7 +375,7 @@ func renderPipeSet(
 }
 
 func equalHashes(a, b *string) bool {
-	// if our selectedCommitHash is nil, there is no selected commit
+	// if our selectedCommitHashPtr is nil, there is no selected commit
 	if a == nil || b == nil {
 		return false
 	}