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

fix lint errors

Browse Source
This commit is contained in:
Jesse Duffield
2020-11-16 20:38:26 +11:00
parent 6faed08d9d
commit 682db77401
28 changed files with 151 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/loading_commits.go
View File

@ -185,9 +185,9 @@ func (c *CommitListBuilder) GetCommits(opts GetCommitsOptions) ([]*models.Commit
// getRebasingCommits obtains the commits that we're in the process of rebasing
func (c *CommitListBuilder) getRebasingCommits(rebaseMode string) ([]*models.Commit, error) {
switch rebaseMode {
case "normal":
case REBASE_MODE_MERGING:
return c.getNormalRebasingCommits()
case "interactive":
case REBASE_MODE_INTERACTIVE:
return c.getInteractiveRebasingCommits()
default:
return nil, nil

4
pkg/commands/loading_stash.go
View File

@ -1,7 +1,6 @@
package commands
import (
"fmt"
"regexp"
"strconv"
"strings"
@ -26,8 +25,7 @@ func (c *GitCommand) GetStashEntries(filterPath string) []*models.StashEntry {
return c.getUnfilteredStashEntries()
}
unescaped := fmt.Sprintf("git stash list --name-only")
rawString, err := c.OSCommand.RunCommandWithOutput(unescaped)
rawString, err := c.OSCommand.RunCommandWithOutput("git stash list --name-only")
if err != nil {
return c.getUnfilteredStashEntries()
}

5
pkg/commands/oscommands/os.go
View File

@ -471,12 +471,13 @@ func RunLineOutputCmd(cmd *exec.Cmd, onLine func(line string) (bool, error)) err
return err
}
if stop {
cmd.Process.Kill()
_ = cmd.Process.Kill()
break
}
}
cmd.Wait()
_ = cmd.Wait()
return nil
}

4
pkg/commands/patch_rebases.go
View File

@ -149,7 +149,7 @@ func (c *GitCommand) PullPatchIntoIndex(commits []*models.Commit, commitIdx int,
}
if err := p.ApplyPatches(true); err != nil {
if c.WorkingTreeState() == "rebasing" {
if c.WorkingTreeState() == REBASE_MODE_REBASING {
if err := c.GenericMergeOrRebaseAction("rebase", "abort"); err != nil {
return err
}
@ -169,7 +169,7 @@ func (c *GitCommand) PullPatchIntoIndex(commits []*models.Commit, commitIdx int,
c.onSuccessfulContinue = func() error {
// add patches to index
if err := p.ApplyPatches(false); err != nil {
if c.WorkingTreeState() == "rebasing" {
if c.WorkingTreeState() == REBASE_MODE_REBASING {
if err := c.GenericMergeOrRebaseAction("rebase", "abort"); err != nil {
return err
}

17
pkg/commands/status.go
View File

@ -6,6 +6,13 @@ import (
gogit "github.com/jesseduffield/go-git/v5"
)
const (
REBASE_MODE_NORMAL = "normal"
REBASE_MODE_INTERACTIVE = "interactive"
REBASE_MODE_REBASING = "rebasing"
REBASE_MODE_MERGING = "merging"
)
// RebaseMode returns "" for non-rebase mode, "normal" for normal rebase
// and "interactive" for interactive rebase
func (c *GitCommand) RebaseMode() (string, error) {
@ -14,11 +21,11 @@ func (c *GitCommand) RebaseMode() (string, error) {
return "", err
}
if exists {
return "normal", nil
return REBASE_MODE_NORMAL, nil
}
exists, err = c.OSCommand.FileExists(filepath.Join(c.DotGitDir, "rebase-merge"))
if exists {
return "interactive", err
return REBASE_MODE_INTERACTIVE, err
} else {
return "", err
}
@ -27,13 +34,13 @@ func (c *GitCommand) RebaseMode() (string, error) {
func (c *GitCommand) WorkingTreeState() string {
rebaseMode, _ := c.RebaseMode()
if rebaseMode != "" {
return "rebasing"
return REBASE_MODE_REBASING
}
merging, _ := c.IsInMergeState()
if merging {
return "merging"
return REBASE_MODE_MERGING
}
return "normal"
return REBASE_MODE_NORMAL
}
// IsInMergeState states whether we are still mid-merge