sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

#477 Remove NeedMerge boolean

Browse Source 
Instead of storing the status in a new variable, derive it from
the existing three fields
This commit is contained in:
Giorgio Previtera
2019-07-14 09:50:20 +01:00
committed by Jesse Duffield
parent 504d506575
commit e83ef9858b
3 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/commands/file.go
View File

@ -12,7 +12,6 @@ type File struct {
Deleted bool
HasMergeConflicts bool
HasInlineMergeConflicts bool
NeedReset bool
DisplayString string
Type string // one of 'file', 'directory', and 'other'
ShortStatus string // e.g. 'AD', ' A', 'M ', '??'

3
pkg/commands/git.go
View File

@ -188,7 +188,6 @@ func (c *GitCommand) GetStatusFiles() []*File {
Deleted: unstagedChange == "D" || stagedChange == "D",
HasMergeConflicts: hasMergeConflicts,
HasInlineMergeConflicts: hasInlineMergeConflicts,
NeedReset: !hasNoStagedChanges || hasMergeConflicts || hasInlineMergeConflicts,
Type: c.OSCommand.FileType(filename),
ShortStatus: change,
}
@ -474,7 +473,7 @@ func (c *GitCommand) RebaseMode() (string, error) {
func (c *GitCommand) DiscardAllFileChanges(file *File) error {
// if the file isn't tracked, we assume you want to delete it
quotedFileName := c.OSCommand.Quote(file.Name)
if file.NeedReset {
if file.HasStagedChanges || file.HasMergeConflicts || file.HasInlineMergeConflicts {
if err := c.OSCommand.RunCommand(fmt.Sprintf("git reset -- %s", quotedFileName)); err != nil {
return err
}

77
pkg/commands/git_test.go
View File

@ -371,7 +371,6 @@ func TestGitCommandGetStatusFiles(t *testing.T) {
Deleted: false,
HasMergeConflicts: false,
HasInlineMergeConflicts: false,
NeedReset: true,
DisplayString: "MM file1.txt",
Type: "other",
ShortStatus: "MM",
@ -384,7 +383,6 @@ func TestGitCommandGetStatusFiles(t *testing.T) {
Deleted: false,
HasMergeConflicts: false,
HasInlineMergeConflicts: false,
NeedReset: true,
DisplayString: "A file3.txt",
Type: "other",
ShortStatus: "A ",
@ -397,7 +395,6 @@ func TestGitCommandGetStatusFiles(t *testing.T) {
Deleted: false,
HasMergeConflicts: false,
HasInlineMergeConflicts: false,
NeedReset: true,
DisplayString: "AM file2.txt",
Type: "other",
ShortStatus: "AM",
@ -410,7 +407,6 @@ func TestGitCommandGetStatusFiles(t *testing.T) {
Deleted: false,
HasMergeConflicts: false,
HasInlineMergeConflicts: false,
NeedReset: false,
DisplayString: "?? file4.txt",
Type: "other",
ShortStatus: "??",
@ -423,7 +419,6 @@ func TestGitCommandGetStatusFiles(t *testing.T) {
Deleted: false,
HasMergeConflicts: true,
HasInlineMergeConflicts: true,
NeedReset: true,
DisplayString: "UU file5.txt",
Type: "other",
ShortStatus: "UU",
@ -1216,8 +1211,8 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) {
})
},
&File{
Name: "test",
NeedReset: true,
Name: "test",
HasStagedChanges: true,
},
func(string) error {
return nil
@ -1299,7 +1294,7 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) {
},
},
{
"Reset and checkout",
"Reset and checkout staged changes",
func() (func(string, ...string) *exec.Cmd, *[][]string) {
cmdsCalled := [][]string{}
return func(cmd string, args ...string) *exec.Cmd {
@ -1317,9 +1312,63 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) {
})
},
&File{
Name: "test",
Tracked: true,
NeedReset: true,
Name: "test",
Tracked: true,
HasStagedChanges: true,
},
func(string) error {
return nil
},
},
{
"Reset and checkout merge conflicts",
func() (func(string, ...string) *exec.Cmd, *[][]string) {
cmdsCalled := [][]string{}
return func(cmd string, args ...string) *exec.Cmd {
cmdsCalled = append(cmdsCalled, args)
return exec.Command("echo")
}, &cmdsCalled
},
func(cmdsCalled *[][]string, err error) {
assert.NoError(t, err)
assert.Len(t, *cmdsCalled, 2)
assert.EqualValues(t, *cmdsCalled, [][]string{
{"reset", "--", "test"},
{"checkout", "--", "test"},
})
},
&File{
Name: "test",
Tracked: true,
HasMergeConflicts: true,
},
func(string) error {
return nil
},
},
{
"Reset and checkout inline merge conflicts",
func() (func(string, ...string) *exec.Cmd, *[][]string) {
cmdsCalled := [][]string{}
return func(cmd string, args ...string) *exec.Cmd {
cmdsCalled = append(cmdsCalled, args)
return exec.Command("echo")
}, &cmdsCalled
},
func(cmdsCalled *[][]string, err error) {
assert.NoError(t, err)
assert.Len(t, *cmdsCalled, 2)
assert.EqualValues(t, *cmdsCalled, [][]string{
{"reset", "--", "test"},
{"checkout", "--", "test"},
})
},
&File{
Name: "test",
Tracked: true,
HasInlineMergeConflicts: true,
},
func(string) error {
return nil
@ -1343,9 +1392,9 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) {
})
},
&File{
Name: "test",
Tracked: false,
NeedReset: true,
Name: "test",
Tracked: false,
HasStagedChanges: true,
},
func(filename string) error {
assert.Equal(t, "test", filename)