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

Add --stat -p to diff args in diffing mode

Browse Source 
This is consistent with what we do for showing single commits (with git show),
and I find it very useful.
This commit is contained in:
Stefan Haller 2024-08-25 14:04:54 +02:00
parent 079c5a9905
commit b07ce19b9a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/helpers/diff_helper.go
View File

@ -22,7 +22,7 @@ func NewDiffHelper(c *HelperCommon) *DiffHelper {
} }
func (self *DiffHelper) DiffArgs() []string { func (self *DiffHelper) DiffArgs() []string {
output := []string{self.c.Modes().Diffing.Ref} output := []string{"--stat", "-p", self.c.Modes().Diffing.Ref}
right := self.currentDiffTerminal() right := self.currentDiffTerminal()
if right != "" { if right != "" {

6
pkg/integration/tests/diff/diff.go
View File

@ -35,11 +35,11 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Branches(). t.Views().Branches().
IsFocused(). IsFocused().
Tap(func() { Tap(func() {
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-a")) t.Views().Information().Content(Contains("Showing output for: git diff --stat -p branch-a branch-a"))
}). }).
SelectNextItem(). SelectNextItem().
Tap(func() { Tap(func() {
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b")) t.Views().Information().Content(Contains("Showing output for: git diff --stat -p branch-a branch-b"))
t.Views().Main().Content(Contains("+second line")) t.Views().Main().Content(Contains("+second line"))
}). }).
PressEnter() PressEnter()
@ -67,7 +67,7 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.DiffingMenu) Press(keys.Universal.DiffingMenu)
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Reverse diff direction")).Confirm() t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Reverse diff direction")).Confirm()
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b -R")) t.Views().Information().Content(Contains("Showing output for: git diff --stat -p branch-a branch-b -R"))
t.Views().Main().Content(Contains("-second line")) t.Views().Main().Content(Contains("-second line"))
}, },
}) })

4
pkg/integration/tests/diff/diff_and_apply_patch.go
View File

@ -32,13 +32,13 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Equals("Diff branch-a")).Confirm() t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Equals("Diff branch-a")).Confirm()
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-a")) t.Views().Information().Content(Contains("Showing output for: git diff --stat -p branch-a branch-a"))
t.Views().Branches(). t.Views().Branches().
IsFocused(). IsFocused().
SelectNextItem(). SelectNextItem().
Tap(func() { Tap(func() {
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b")) t.Views().Information().Content(Contains("Showing output for: git diff --stat -p branch-a branch-b"))
t.Views().Main().Content(Contains("+second line")) t.Views().Main().Content(Contains("+second line"))
}). }).
PressEnter() PressEnter()