summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-03-27 21:23:42 +1100
committerJesse Duffield <jessedduffield@gmail.com>2020-03-28 11:59:45 +1100
commit61b4bbf74eb9d4e402a2527ccc15b7ff15215fb4 (patch)
treea9a0716b528a42a9082204bbe85d29c70f6022c7 /pkg/gui
parent384c2e13d7f215aef7c9307f6214c4a1740b9f10 (diff)
clean up signature
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/branches_panel.go4
-rw-r--r--pkg/gui/commits_panel.go26
-rw-r--r--pkg/gui/credentials_panel.go2
-rw-r--r--pkg/gui/gui.go2
-rw-r--r--pkg/gui/tags_panel.go4
-rw-r--r--pkg/gui/view_helpers.go4
6 files changed, 21 insertions, 21 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index 6efb52264..996d3c7b2 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -358,7 +358,7 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {
if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
_ = gui.createErrorPanel(gui.g, err.Error())
}
- _ = gui.refreshCommits(gui.g)
+ _ = gui.refreshCommits()
}
_ = gui.closeConfirmationPrompt(gui.g, true)
@@ -465,7 +465,7 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
- return gui.refreshCommits(gui.g)
+ return gui.refreshCommits()
})
}
diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index c2757ab93..6b71b5a1b 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -71,7 +71,7 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
return nil
}
-func (gui *Gui) refreshCommits(g *gocui.Gui) error {
+func (gui *Gui) refreshCommits() error {
wg := sync.WaitGroup{}
wg.Add(2)
@@ -83,7 +83,7 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
go func() {
gui.refreshCommitsWithLimit()
- if g.CurrentView() == gui.getCommitFilesView() || (g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
+ if gui.g.CurrentView() == gui.getCommitFilesView() || (gui.g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
gui.refreshCommitFilesView()
}
wg.Done()
@@ -177,7 +177,7 @@ func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
if err := gui.GitCommand.RenameCommit(v.Buffer()); err != nil {
return gui.createErrorPanel(g, err.Error())
}
- if err := gui.refreshCommits(g); err != nil {
+ if err := gui.refreshCommits(); err != nil {
panic(err)
}
return gui.handleCommitSelect(g, v)
@@ -225,7 +225,7 @@ func (gui *Gui) handleMidRebaseCommand(action string) (bool, error) {
if err := gui.GitCommand.EditRebaseTodo(gui.State.Panels.Commits.SelectedLine, action); err != nil {
return false, gui.createErrorPanel(gui.g, err.Error())
}
- return true, gui.refreshCommits(gui.g)
+ return true, gui.refreshCommits()
}
func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
@@ -256,7 +256,7 @@ func (gui *Gui) handleCommitMoveDown(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
gui.State.Panels.Commits.SelectedLine++
- return gui.refreshCommits(gui.g)
+ return gui.refreshCommits()
}
return gui.WithWaitingStatus(gui.Tr.SLocalize("MovingStatus"), func() error {
@@ -279,7 +279,7 @@ func (gui *Gui) handleCommitMoveUp(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
gui.State.Panels.Commits.SelectedLine--
- return gui.refreshCommits(gui.g)
+ return gui.refreshCommits()
}
return gui.WithWaitingStatus(gui.Tr.SLocalize("MovingStatus"), func() error {
@@ -334,7 +334,7 @@ func (gui *Gui) handleCommitRevert(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error())
}
gui.State.Panels.Commits.SelectedLine++
- return gui.refreshCommits(gui.g)
+ return gui.refreshCommits()
}
func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error {
@@ -345,12 +345,12 @@ func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error {
for index, cherryPickedCommit := range gui.State.CherryPickedCommits {
if commit.Sha == cherryPickedCommit.Sha {
gui.State.CherryPickedCommits = append(gui.State.CherryPickedCommits[0:index], gui.State.CherryPickedCommits[index+1:]...)
- return gui.refreshCommits(gui.g)
+ return gui.refreshCommits()
}
}
gui.addCommitToCherryPickedCommits(gui.State.Panels.Commits.SelectedLine)
- return gui.refreshCommits(gui.g)
+ return gui.refreshCommits()
}
func (gui *Gui) cherryPickedCommitShaMap() map[string]bool {
@@ -460,7 +460,7 @@ func (gui *Gui) setDiffMode() {
v.Title = gui.Tr.SLocalize("CommitsTitle")
}
- _ = gui.refreshCommits(gui.g)
+ _ = gui.refreshCommits()
}
func (gui *Gui) hasCommit(commits []*commands.Commit, target string) (int, bool) {
@@ -532,7 +532,7 @@ func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), commitSha); err != nil {
return gui.createErrorPanel(g, err.Error())
}
- if err := gui.refreshCommits(g); err != nil {
+ if err := gui.refreshCommits(); err != nil {
return gui.createErrorPanel(g, err.Error())
}
if err := gui.refreshTags(); err != nil {
@@ -644,7 +644,7 @@ func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) err
// we usually lazyload these commits but now that we're searching we need to load them now
if gui.State.Panels.Commits.LimitCommits {
gui.State.Panels.Commits.LimitCommits = false
- if err := gui.refreshCommits(gui.g); err != nil {
+ if err := gui.refreshCommits(); err != nil {
return err
}
}
@@ -654,5 +654,5 @@ func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) err
func (gui *Gui) handleResetCherryPick(g *gocui.Gui, v *gocui.View) error {
gui.State.CherryPickedCommits = []*commands.Commit{}
- return gui.refreshCommits(gui.g)
+ return gui.refreshCommits()
}
diff --git a/pkg/gui/credentials_panel.go b/pkg/gui/credentials_panel.go
index 7be93cc94..21c15ca92 100644
--- a/pkg/gui/credentials_panel.go
+++ b/pkg/gui/credentials_panel.go
@@ -57,7 +57,7 @@ func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error {
if err != nil {
return err
}
- return gui.refreshCommits(g)
+ return gui.refreshCommits()
}
func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error {
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 1c3c733c0..8c0a61e65 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -922,7 +922,7 @@ func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (u
_ = gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Error"), coloredMessage, close, close)
}
- if err := gui.refreshCommits(g); err != nil {
+ if err := gui.refreshCommits(); err != nil {
return unamePassOpend, err
}
diff --git a/pkg/gui/tags_panel.go b/pkg/gui/tags_panel.go
index 0599525b0..78c3122cd 100644
--- a/pkg/gui/tags_panel.go
+++ b/pkg/gui/tags_panel.go
@@ -104,7 +104,7 @@ func (gui *Gui) handleDeleteTag(g *gocui.Gui, v *gocui.View) error {
if err := gui.GitCommand.DeleteTag(tag.Name); err != nil {
return gui.createErrorPanel(gui.g, err.Error())
}
- if err := gui.refreshCommits(g); err != nil {
+ if err := gui.refreshCommits(); err != nil {
return gui.createErrorPanel(g, err.Error())
}
if err := gui.refreshTags(); err != nil {
@@ -141,7 +141,7 @@ func (gui *Gui) handleCreateTag(g *gocui.Gui, v *gocui.View) error {
if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), ""); err != nil {
return gui.createErrorPanel(gui.g, err.Error())
}
- if err := gui.refreshCommits(g); err != nil {
+ if err := gui.refreshCommits(); err != nil {
return gui.createErrorPanel(g, err.Error())
}
if err := gui.refreshTags(); err != nil {
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index f4227ba67..fbf8ad847 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -64,9 +64,9 @@ func (gui *Gui) refreshSidePanels(options refreshOptions) error {
wg.Add(1)
func() {
if options.mode == ASYNC {
- go gui.refreshCommits(gui.g)
+ go gui.refreshCommits()
} else {
- gui.refreshCommits(gui.g)
+ gui.refreshCommits()
}
wg.Done()
}()