mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
112 lines
3.6 KiB
Go
112 lines
3.6 KiB
Go
package commands
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
// GetStatusFiles git status files
|
|
type GetStatusFileOptions struct {
|
|
NoRenames bool
|
|
}
|
|
|
|
func (c *GitCommand) GetStatusFiles(opts GetStatusFileOptions) []*models.File {
|
|
// check if config wants us ignoring untracked files
|
|
untrackedFilesSetting := c.GetConfigValue("status.showUntrackedFiles")
|
|
|
|
if untrackedFilesSetting == "" {
|
|
untrackedFilesSetting = "all"
|
|
}
|
|
untrackedFilesArg := fmt.Sprintf("--untracked-files=%s", untrackedFilesSetting)
|
|
|
|
statusOutput, err := c.GitStatus(GitStatusOptions{NoRenames: opts.NoRenames, UntrackedFilesArg: untrackedFilesArg})
|
|
if err != nil {
|
|
c.Log.Error(err)
|
|
}
|
|
statusStrings := utils.SplitLines(statusOutput)
|
|
files := []*models.File{}
|
|
|
|
for _, statusString := range statusStrings {
|
|
if strings.HasPrefix(statusString, "warning") {
|
|
c.Log.Warningf("warning when calling git status: %s", statusString)
|
|
continue
|
|
}
|
|
change := statusString[0:2]
|
|
stagedChange := change[0:1]
|
|
unstagedChange := statusString[1:2]
|
|
filename := c.OSCommand.Unquote(statusString[3:])
|
|
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)
|
|
|
|
file := &models.File{
|
|
Name: filename,
|
|
DisplayString: statusString,
|
|
HasStagedChanges: !hasNoStagedChanges,
|
|
HasUnstagedChanges: unstagedChange != " ",
|
|
Tracked: !untracked,
|
|
Deleted: unstagedChange == "D" || stagedChange == "D",
|
|
HasMergeConflicts: hasMergeConflicts,
|
|
HasInlineMergeConflicts: hasInlineMergeConflicts,
|
|
Type: c.OSCommand.FileType(filename),
|
|
ShortStatus: change,
|
|
}
|
|
files = append(files, file)
|
|
}
|
|
return files
|
|
}
|
|
|
|
// GitStatus returns the plaintext short status of the repo
|
|
type GitStatusOptions struct {
|
|
NoRenames bool
|
|
UntrackedFilesArg string
|
|
}
|
|
|
|
func (c *GitCommand) GitStatus(opts GitStatusOptions) (string, error) {
|
|
noRenamesFlag := ""
|
|
if opts.NoRenames {
|
|
noRenamesFlag = "--no-renames"
|
|
}
|
|
|
|
return c.OSCommand.RunCommandWithOutput("git status %s --porcelain %s", opts.UntrackedFilesArg, noRenamesFlag)
|
|
}
|
|
|
|
// MergeStatusFiles merge status files
|
|
func (c *GitCommand) MergeStatusFiles(oldFiles, newFiles []*models.File, selectedFile *models.File) []*models.File {
|
|
if len(oldFiles) == 0 {
|
|
return newFiles
|
|
}
|
|
|
|
appendedIndexes := []int{}
|
|
|
|
// retain position of files we already could see
|
|
result := []*models.File{}
|
|
for _, oldFile := range oldFiles {
|
|
for newIndex, newFile := range newFiles {
|
|
if utils.IncludesInt(appendedIndexes, newIndex) {
|
|
continue
|
|
}
|
|
// if we just staged B and in doing so created 'A -> B' and we are currently have oldFile: A and newFile: 'A -> B', we want to wait until we come across B so the our cursor isn't jumping anywhere
|
|
waitForMatchingFile := selectedFile != nil && newFile.IsRename() && !selectedFile.IsRename() && newFile.Matches(selectedFile) && !oldFile.Matches(selectedFile)
|
|
|
|
if oldFile.Matches(newFile) && !waitForMatchingFile {
|
|
result = append(result, newFile)
|
|
appendedIndexes = append(appendedIndexes, newIndex)
|
|
}
|
|
}
|
|
}
|
|
|
|
// append any new files to the end
|
|
for index, newFile := range newFiles {
|
|
if !utils.IncludesInt(appendedIndexes, index) {
|
|
result = append(result, newFile)
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|