Show the number of lines changed per file in working file tree view

docs/Config.md

@@ -164,6 +164,9 @@ gui:
   # This can be toggled from within Lazygit with the '~' key, but that will not change the default.
   showFileTree: true
 
+  # If true, show the number of lines changed per file in the Files view
+  showNumberOfLineChangesFilesView: false
+
   # If true, show a random tip in the command log when Lazygit starts
   showRandomTip: true
 

pkg/commands/git_commands/file_loader.go

@@ -3,6 +3,7 @@ package git_commands
 import (
 	"fmt"
 	"path/filepath"
+	"strconv"
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
@@ -30,7 +31,8 @@ func NewFileLoader(gitCommon *GitCommon, cmd oscommands.ICmdObjBuilder, config F
 }
 
 type GetStatusFileOptions struct {
-	NoRenames bool
+	NoRenames    bool
+	GetFileDiffs bool
 }
 
 func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File {
@@ -48,6 +50,14 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File
 	}
 	files := []*models.File{}
 
+	fileDiffs := map[string]FileDiff{}
+	if self.GitCommon.Common.UserConfig().Gui.ShowNumberOfLineChangesFilesView {
+		fileDiffs, err = self.getFileDiffs()
+		if err != nil {
+			self.Log.Error(err)
+		}
+	}
+
 	for _, status := range statuses {
 		if strings.HasPrefix(status.StatusString, "warning") {
 			self.Log.Warningf("warning when calling git status: %s", status.StatusString)
@@ -60,6 +70,11 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File
 			DisplayString: status.StatusString,
 		}
 
+		if diff, ok := fileDiffs[status.Name]; ok {
+			file.LinesAdded = diff.LinesAdded
+			file.LinesDeleted = diff.LinesDeleted
+		}
+
 		models.SetStatusFields(file, status.Change)
 		files = append(files, file)
 	}
@@ -87,6 +102,45 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File
 	return files
 }
 
+type FileDiff struct {
+	LinesAdded   int
+	LinesDeleted int
+}
+
+func (fileLoader *FileLoader) getFileDiffs() (map[string]FileDiff, error) {
+	diffs, err := fileLoader.gitDiffNumStat()
+	if err != nil {
+		return nil, err
+	}
+
+	splitLines := strings.Split(diffs, "\x00")
+
+	fileDiffs := map[string]FileDiff{}
+	for _, line := range splitLines {
+		splitLine := strings.Split(line, "\t")
+		if len(splitLine) != 3 {
+			continue
+		}
+
+		linesAdded, err := strconv.Atoi(splitLine[0])
+		if err != nil {
+			continue
+		}
+		linesDeleted, err := strconv.Atoi(splitLine[1])
+		if err != nil {
+			continue
+		}
+
+		fileName := splitLine[2]
+		fileDiffs[fileName] = FileDiff{
+			LinesAdded:   linesAdded,
+			LinesDeleted: linesDeleted,
+		}
+	}
+
+	return fileDiffs, nil
+}
+
 // GitStatus returns the file status of the repo
 type GitStatusOptions struct {
 	NoRenames         bool
@@ -100,6 +154,16 @@ type FileStatus struct {
 	PreviousName string
 }
 
+func (fileLoader *FileLoader) gitDiffNumStat() (string, error) {
+	return fileLoader.cmd.New(
+		NewGitCmd("diff").
+			Arg("--numstat").
+			Arg("-z").
+			Arg("HEAD").
+			ToArgv(),
+	).DontLog().RunWithOutput()
+}
+
 func (self *FileLoader) gitStatus(opts GitStatusOptions) ([]FileStatus, error) {
 	cmdArgs := NewGitCmd("status").
 		Arg(opts.UntrackedFilesArg).

pkg/commands/git_commands/file_loader_test.go

@@ -11,29 +11,35 @@ import (
 
 func TestFileGetStatusFiles(t *testing.T) {
 	type scenario struct {
-		testName            string
-		similarityThreshold int
-		runner              oscommands.ICmdObjRunner
-		expectedFiles       []*models.File
+		testName                         string
+		similarityThreshold              int
+		runner                           oscommands.ICmdObjRunner
+		showNumberOfLineChangesFilesView bool
+		expectedFiles                    []*models.File
 	}
 
 	scenarios := []scenario{
 		{
-			"No files found",
-			50,
-			oscommands.NewFakeRunner(t).
+			testName:            "No files found",
+			similarityThreshold: 50,
+			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z", "--find-renames=50%"}, "", nil),
-			[]*models.File{},
+			expectedFiles: []*models.File{},
 		},
 		{
-			"Several files found",
-			50,
-			oscommands.NewFakeRunner(t).
+			testName:            "Several files found",
+			similarityThreshold: 50,
+			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z", "--find-renames=50%"},
 					"MM file1.txt\x00A  file3.txt\x00AM file2.txt\x00?? file4.txt\x00UU file5.txt",
 					nil,
+				).
+				ExpectGitArgs([]string{"diff", "--numstat", "-z", "HEAD"},
+					"4\t1\tfile1.txt\x001\t0\tfile2.txt\x002\t2\tfile3.txt\x000\t2\tfile4.txt\x002\t2\tfile5.txt",
+					nil,
 				),
-			[]*models.File{
+			showNumberOfLineChangesFilesView: true,
+			expectedFiles: []*models.File{
 				{
 					Name:                    "file1.txt",
 					HasStagedChanges:        true,
@@ -45,6 +51,8 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasInlineMergeConflicts: false,
 					DisplayString:           "MM file1.txt",
 					ShortStatus:             "MM",
+					LinesAdded:              4,
+					LinesDeleted:            1,
 				},
 				{
 					Name:                    "file3.txt",
@@ -57,6 +65,8 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasInlineMergeConflicts: false,
 					DisplayString:           "A  file3.txt",
 					ShortStatus:             "A ",
+					LinesAdded:              2,
+					LinesDeleted:            2,
 				},
 				{
 					Name:                    "file2.txt",
@@ -69,6 +79,8 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasInlineMergeConflicts: false,
 					DisplayString:           "AM file2.txt",
 					ShortStatus:             "AM",
+					LinesAdded:              1,
+					LinesDeleted:            0,
 				},
 				{
 					Name:                    "file4.txt",
@@ -81,6 +93,8 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasInlineMergeConflicts: false,
 					DisplayString:           "?? file4.txt",
 					ShortStatus:             "??",
+					LinesAdded:              0,
+					LinesDeleted:            2,
 				},
 				{
 					Name:                    "file5.txt",
@@ -93,15 +107,17 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasInlineMergeConflicts: true,
 					DisplayString:           "UU file5.txt",
 					ShortStatus:             "UU",
+					LinesAdded:              2,
+					LinesDeleted:            2,
 				},
 			},
 		},
 		{
-			"File with new line char",
-			50,
-			oscommands.NewFakeRunner(t).
+			testName:            "File with new line char",
+			similarityThreshold: 50,
+			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z", "--find-renames=50%"}, "MM a\nb.txt", nil),
-			[]*models.File{
+			expectedFiles: []*models.File{
 				{
 					Name:                    "a\nb.txt",
 					HasStagedChanges:        true,
@@ -117,14 +133,14 @@ func TestFileGetStatusFiles(t *testing.T) {
 			},
 		},
 		{
-			"Renamed files",
-			50,
-			oscommands.NewFakeRunner(t).
+			testName:            "Renamed files",
+			similarityThreshold: 50,
+			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z", "--find-renames=50%"},
 					"R  after1.txt\x00before1.txt\x00RM after2.txt\x00before2.txt",
 					nil,
 				),
-			[]*models.File{
+			expectedFiles: []*models.File{
 				{
 					Name:                    "after1.txt",
 					PreviousName:            "before1.txt",
@@ -154,14 +170,14 @@ func TestFileGetStatusFiles(t *testing.T) {
 			},
 		},
 		{
-			"File with arrow in name",
-			50,
-			oscommands.NewFakeRunner(t).
+			testName:            "File with arrow in name",
+			similarityThreshold: 50,
+			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z", "--find-renames=50%"},
 					`?? a -> b.txt`,
 					nil,
 				),
-			[]*models.File{
+			expectedFiles: []*models.File{
 				{
 					Name:                    "a -> b.txt",
 					HasStagedChanges:        false,
@@ -185,8 +201,14 @@ func TestFileGetStatusFiles(t *testing.T) {
 			appState := &config.AppState{}
 			appState.RenameSimilarityThreshold = s.similarityThreshold
 
+			userConfig := &config.UserConfig{
+				Gui: config.GuiConfig{
+					ShowNumberOfLineChangesFilesView: s.showNumberOfLineChangesFilesView,
+				},
+			}
+
 			loader := &FileLoader{
-				GitCommon:   buildGitCommon(commonDeps{appState: appState}),
+				GitCommon:   buildGitCommon(commonDeps{appState: appState, userConfig: userConfig}),
 				cmd:         cmd,
 				config:      &FakeFileLoaderConfig{showUntrackedFiles: "yes"},
 				getFileType: func(string) string { return "file" },

pkg/commands/models/file.go

@@ -19,6 +19,8 @@ type File struct {
 	HasInlineMergeConflicts bool
 	DisplayString           string
 	ShortStatus             string // e.g. 'AD', ' A', 'M ', '??'
+	LinesDeleted            int
+	LinesAdded              int
 
 	// If true, this must be a worktree folder
 	IsWorktree bool

pkg/config/user_config.go

@@ -109,6 +109,8 @@ type GuiConfig struct {
 	// If true, display the files in the file views as a tree. If false, display the files as a flat list.
 	// This can be toggled from within Lazygit with the '~' key, but that will not change the default.
 	ShowFileTree bool `yaml:"showFileTree"`
+	// If true, show the number of lines changed per file in the Files view
+	ShowNumberOfLineChangesFilesView bool `yaml:"showNumberOfLineChangesFilesView"`
 	// If true, show a random tip in the command log when Lazygit starts
 	ShowRandomTip bool `yaml:"showRandomTip"`
 	// If true, show the command log
@@ -705,30 +707,31 @@ func GetDefaultConfig() *UserConfig {
 				UnstagedChangesColor:            []string{"red"},
 				DefaultFgColor:                  []string{"default"},
 			},
-			CommitLength:                 CommitLengthConfig{Show: true},
-			SkipNoStagedFilesWarning:     false,
-			ShowListFooter:               true,
-			ShowCommandLog:               true,
-			ShowBottomLine:               true,
-			ShowPanelJumps:               true,
-			ShowFileTree:                 true,
-			ShowRandomTip:                true,
-			ShowIcons:                    false,
-			NerdFontsVersion:             "",
-			ShowFileIcons:                true,
-			CommitAuthorShortLength:      2,
-			CommitAuthorLongLength:       17,
-			CommitHashLength:             8,
-			ShowBranchCommitHash:         false,
-			ShowDivergenceFromBaseBranch: "none",
-			CommandLogSize:               8,
-			SplitDiff:                    "auto",
-			SkipRewordInEditorWarning:    false,
-			WindowSize:                   "normal",
-			Border:                       "rounded",
-			AnimateExplosion:             true,
-			PortraitMode:                 "auto",
-			FilterMode:                   "substring",
+			CommitLength:                     CommitLengthConfig{Show: true},
+			SkipNoStagedFilesWarning:         false,
+			ShowListFooter:                   true,
+			ShowCommandLog:                   true,
+			ShowBottomLine:                   true,
+			ShowPanelJumps:                   true,
+			ShowFileTree:                     true,
+			ShowNumberOfLineChangesFilesView: false,
+			ShowRandomTip:                    true,
+			ShowIcons:                        false,
+			NerdFontsVersion:                 "",
+			ShowFileIcons:                    true,
+			CommitAuthorShortLength:          2,
+			CommitAuthorLongLength:           17,
+			CommitHashLength:                 8,
+			ShowBranchCommitHash:             false,
+			ShowDivergenceFromBaseBranch:     "none",
+			CommandLogSize:                   8,
+			SplitDiff:                        "auto",
+			SkipRewordInEditorWarning:        false,
+			WindowSize:                       "normal",
+			Border:                           "rounded",
+			AnimateExplosion:                 true,
+			PortraitMode:                     "auto",
+			FilterMode:                       "substring",
 			Spinner: SpinnerConfig{
 				Frames: []string{"|", "/", "-", "\\"},
 				Rate:   50,

pkg/gui/context/working_tree_context.go

@@ -30,7 +30,8 @@ func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
 
 	getDisplayStrings := func(_ int, _ int) [][]string {
 		showFileIcons := icons.IsIconEnabled() && c.UserConfig().Gui.ShowFileIcons
-		lines := presentation.RenderFileTree(viewModel, c.Model().Submodules, showFileIcons)
+		showNumberOfLineChanges := c.UserConfig().Gui.ShowNumberOfLineChangesFilesView
+		lines := presentation.RenderFileTree(viewModel, c.Model().Submodules, showFileIcons, showNumberOfLineChanges)
 		return lo.Map(lines, func(line string, _ int) []string {
 			return []string{line}
 		})