diff options
author | Mark Kopenga <mkopenga@gmail.com> | 2021-08-16 17:29:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-16 17:29:08 +0200 |
commit | c878f34ff193beaa70a5dda0d5ac56d1c6be7b17 (patch) | |
tree | 67d971588b60c52af409c715b911300214f5e2b6 | |
parent | f8db3592e345416fc74bc2e36af67f0af4aaa975 (diff) | |
parent | a2f7fcd7303e4ee55cceb50605db8d0581711e2d (diff) |
Merge pull request #1438 from Ryooooooga/feature/rename-files-with-modification
Fix staged renamed file with unstaged in file pane #1408
-rw-r--r-- | pkg/commands/loading_files.go | 65 | ||||
-rw-r--r-- | pkg/commands/loading_files_test.go | 75 | ||||
-rw-r--r-- | pkg/commands/models/file.go | 2 |
3 files changed, 112 insertions, 30 deletions
diff --git a/pkg/commands/loading_files.go b/pkg/commands/loading_files.go index 2b9bfc2be..d3638a724 100644 --- a/pkg/commands/loading_files.go +++ b/pkg/commands/loading_files.go @@ -8,8 +8,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/utils" ) -const RENAME_SEPARATOR = " -> " - // GetStatusFiles git status files type GetStatusFileOptions struct { NoRenames bool @@ -24,36 +22,29 @@ func (c *GitCommand) GetStatusFiles(opts GetStatusFileOptions) []*models.File { } untrackedFilesArg := fmt.Sprintf("--untracked-files=%s", untrackedFilesSetting) - statusStrings, err := c.GitStatus(GitStatusOptions{NoRenames: opts.NoRenames, UntrackedFilesArg: untrackedFilesArg}) + statuses, err := c.GitStatus(GitStatusOptions{NoRenames: opts.NoRenames, UntrackedFilesArg: untrackedFilesArg}) if err != nil { c.Log.Error(err) } files := []*models.File{} - for _, statusString := range statusStrings { - if strings.HasPrefix(statusString, "warning") { - c.Log.Warningf("warning when calling git status: %s", statusString) + for _, status := range statuses { + if strings.HasPrefix(status.StatusString, "warning") { + c.Log.Warningf("warning when calling git status: %s", status.StatusString) continue } - change := statusString[0:2] + change := status.Change stagedChange := change[0:1] - unstagedChange := statusString[1:2] - name := statusString[3:] + unstagedChange := change[1:2] untracked := utils.IncludesString([]string{"??", "A ", "AM"}, change) hasNoStagedChanges := utils.IncludesString([]string{" ", "U", "?"}, stagedChange) hasMergeConflicts := utils.IncludesString([]string{"DD", "AA", "UU", "AU", "UA", "UD", "DU"}, change) hasInlineMergeConflicts := utils.IncludesString([]string{"UU", "AA"}, change) - previousName := "" - if strings.Contains(name, RENAME_SEPARATOR) { - split := strings.Split(name, RENAME_SEPARATOR) - name = split[1] - previousName = split[0] - } file := &models.File{ - Name: name, - PreviousName: previousName, - DisplayString: statusString, + Name: status.Name, + PreviousName: status.PreviousName, + DisplayString: status.StatusString, HasStagedChanges: !hasNoStagedChanges, HasUnstagedChanges: unstagedChange != " ", Tracked: !untracked, @@ -61,7 +52,7 @@ func (c *GitCommand) GetStatusFiles(opts GetStatusFileOptions) []*models.File { Added: unstagedChange == "A" || untracked, HasMergeConflicts: hasMergeConflicts, HasInlineMergeConflicts: hasInlineMergeConflicts, - Type: c.OSCommand.FileType(name), + Type: c.OSCommand.FileType(status.Name), ShortStatus: change, } files = append(files, file) @@ -70,13 +61,20 @@ func (c *GitCommand) GetStatusFiles(opts GetStatusFileOptions) []*models.File { return files } -// GitStatus returns the plaintext short status of the repo +// GitStatus returns the file status of the repo type GitStatusOptions struct { NoRenames bool UntrackedFilesArg string } -func (c *GitCommand) GitStatus(opts GitStatusOptions) ([]string, error) { +type FileStatus struct { + StatusString string + Change string // ??, MM, AM, ... + Name string + PreviousName string +} + +func (c *GitCommand) GitStatus(opts GitStatusOptions) ([]FileStatus, error) { noRenamesFlag := "" if opts.NoRenames { noRenamesFlag = "--no-renames" @@ -84,23 +82,34 @@ func (c *GitCommand) GitStatus(opts GitStatusOptions) ([]string, error) { statusLines, err := c.RunCommandWithOutput("git status %s --porcelain -z %s", opts.UntrackedFilesArg, noRenamesFlag) if err != nil { - return []string{}, err + return []FileStatus{}, err } splitLines := strings.Split(statusLines, "\x00") - response := []string{} + response := []FileStatus{} for i := 0; i < len(splitLines); i++ { original := splitLines[i] - if len(original) < 2 { + + if len(original) < 3 { continue - } else if strings.HasPrefix(original, "R ") { + } + + status := FileStatus{ + StatusString: original, + Change: original[:2], + Name: original[3:], + PreviousName: "", + } + + if strings.HasPrefix(status.Change, "R") { // if a line starts with 'R' then the next line is the original file. - next := strings.TrimSpace(splitLines[i+1]) - original = "R " + next + RENAME_SEPARATOR + strings.TrimPrefix(original, "R ") + status.PreviousName = strings.TrimSpace(splitLines[i+1]) + status.StatusString = fmt.Sprintf("%s %s -> %s", status.Change, status.PreviousName, status.Name) i++ } - response = append(response, original) + + response = append(response, status) } return response, nil diff --git a/pkg/commands/loading_files_test.go b/pkg/commands/loading_files_test.go index eefb8f924..456e4aca7 100644 --- a/pkg/commands/loading_files_test.go +++ b/pkg/commands/loading_files_test.go @@ -139,6 +139,81 @@ func TestGitCommandGetStatusFiles(t *testing.T) { assert.EqualValues(t, expected, files) }, }, + { + "Renamed files", + func(cmd string, args ...string) *exec.Cmd { + return secureexec.Command( + "printf", + `R after1.txt\0before1.txt\0RM after2.txt\0before2.txt`, + ) + }, + func(files []*models.File) { + assert.Len(t, files, 2) + + expected := []*models.File{ + { + Name: "after1.txt", + PreviousName: "before1.txt", + HasStagedChanges: true, + HasUnstagedChanges: false, + Tracked: true, + Added: false, + Deleted: false, + HasMergeConflicts: false, + HasInlineMergeConflicts: false, + DisplayString: "R before1.txt -> after1.txt", + Type: "other", + ShortStatus: "R ", + }, + { + Name: "after2.txt", + PreviousName: "before2.txt", + HasStagedChanges: true, + HasUnstagedChanges: true, + Tracked: true, + Added: false, + Deleted: false, + HasMergeConflicts: false, + HasInlineMergeConflicts: false, + DisplayString: "RM before2.txt -> after2.txt", + Type: "other", + ShortStatus: "RM", + }, + } + + assert.EqualValues(t, expected, files) + }, + }, + { + "File with arrow in name", + func(cmd string, args ...string) *exec.Cmd { + return secureexec.Command( + "printf", + `?? a -> b.txt`, + ) + }, + func(files []*models.File) { + assert.Len(t, files, 1) + + expected := []*models.File{ + { + Name: "a -> b.txt", + HasStagedChanges: false, + HasUnstagedChanges: true, + Tracked: false, + Added: true, + Deleted: false, + HasMergeConflicts: false, + HasInlineMergeConflicts: false, + DisplayString: "?? a -> b.txt", + Type: "other", + ShortStatus: "??", + }, + } + + assert.EqualValues(t, expected, files) + }, + }, } for _, s := range scenarios { diff --git a/pkg/commands/models/file.go b/pkg/commands/models/file.go index 0bbca78ae..6ab34d6ab 100644 --- a/pkg/commands/models/file.go +++ b/pkg/commands/models/file.go @@ -29,8 +29,6 @@ type IFile interface { GetPath() string } -const RENAME_SEPARATOR = " -> " - func (f *File) IsRename() bool { return f.PreviousName != "" } |