summaryrefslogtreecommitdiff
path: root/pkg/gui
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/branchview.go36
-rw-r--r--pkg/gui/gui-util.go6
-rw-r--r--pkg/gui/gui.go13
-rw-r--r--pkg/gui/remotebranchview.go18
-rw-r--r--pkg/gui/remotesview.go6
-rw-r--r--pkg/gui/stagedview.go12
-rw-r--r--pkg/gui/stashview.go18
-rw-r--r--pkg/gui/statusview.go12
-rw-r--r--pkg/gui/unstagedview.go18
9 files changed, 46 insertions, 93 deletions
diff --git a/pkg/gui/branchview.go b/pkg/gui/branchview.go
index c955cf0..f69a212 100644
--- a/pkg/gui/branchview.go
+++ b/pkg/gui/branchview.go
@@ -26,10 +26,8 @@ func (gui *Gui) updateBranch(g *gocui.Gui, entity *git.RepoEntity) error {
}
fmt.Fprintln(out, tab+b.Name)
}
- if err = gui.smartAnchorRelativeToLine(out, currentindex, totalbranches); err != nil {
- return err
- }
- return nil
+ err = gui.smartAnchorRelativeToLine(out, currentindex, totalbranches)
+ return err
}
// iteration handler for the branchview
@@ -37,17 +35,13 @@ func (gui *Gui) nextBranch(g *gocui.Gui, v *gocui.View) error {
var err error
entity := gui.getSelectedRepository()
if err = entity.Checkout(entity.NextBranch()); err != nil {
- if err = gui.openErrorView(g, err.Error(),
+ err = gui.openErrorView(g, err.Error(),
"You should manually resolve this issue",
- branchViewFeature.Name); err != nil {
- return err
- }
- return nil
- }
- if err = gui.checkoutFollowUp(g, entity); err != nil {
+ branchViewFeature.Name)
return err
}
- return nil
+ err = gui.checkoutFollowUp(g, entity)
+ return err
}
// iteration handler for the branchview
@@ -55,17 +49,13 @@ func (gui *Gui) previousBranch(g *gocui.Gui, v *gocui.View) error {
var err error
entity := gui.getSelectedRepository()
if err = entity.Checkout(entity.PreviousBranch()); err != nil {
- if err = gui.openErrorView(g, err.Error(),
+ err = gui.openErrorView(g, err.Error(),
"You should manually resolve this issue",
- branchViewFeature.Name); err != nil {
- return err
- }
- return nil
- }
- if err = gui.checkoutFollowUp(g, entity); err != nil {
+ branchViewFeature.Name)
return err
}
- return nil
+ err = gui.checkoutFollowUp(g, entity)
+ return err
}
// after checkout a branch some refreshments needed
@@ -79,8 +69,6 @@ func (gui *Gui) checkoutFollowUp(g *gocui.Gui, entity *git.RepoEntity) (err erro
if err = gui.updateRemoteBranches(g, entity); err != nil {
return err
}
- if err = gui.refreshMain(g); err != nil {
- return err
- }
- return nil
+ err = gui.refreshMain(g)
+ return err
}
diff --git a/pkg/gui/gui-util.go b/pkg/gui/gui-util.go
index 2462723..bd02f7c 100644
--- a/pkg/gui/gui-util.go
+++ b/pkg/gui/gui-util.go
@@ -116,10 +116,8 @@ func (gui *Gui) correctCursor(v *gocui.View) error {
if err := v.SetCursor(cx, newCy); err != nil {
return err
}
- if err := v.SetOrigin(ox, ly-newCy); err != nil {
- return err
- }
- return nil
+ err := v.SetOrigin(ox, ly-newCy)
+ return err
}
// this function handles the iteration of a side view and set its origin point
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 0cf9458..2e75b4a 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -203,20 +203,15 @@ func (gui *Gui) layout(g *gocui.Gui) error {
// focus to next view
func (gui *Gui) nextMainView(g *gocui.Gui, v *gocui.View) error {
- if err := gui.nextViewOfGroup(g, v, mainViews); err != nil {
- return err
- }
- return nil
+ err := gui.nextViewOfGroup(g, v, mainViews)
+ return err
}
// focus to previous view
func (gui *Gui) previousMainView(g *gocui.Gui, v *gocui.View) error {
- if err := gui.previousViewOfGroup(g, v, mainViews); err != nil {
- return err
- }
- return nil
+ err := gui.previousViewOfGroup(g, v, mainViews)
+ return err
}
-
// quit from the gui and end its loop
func (gui *Gui) quit(g *gocui.Gui, v *gocui.View) error {
return gocui.ErrQuit
diff --git a/pkg/gui/remotebranchview.go b/pkg/gui/remotebranchview.go
index 6c58565..4974808 100644
--- a/pkg/gui/remotebranchview.go
+++ b/pkg/gui/remotebranchview.go
@@ -51,10 +51,8 @@ func (gui *Gui) syncRemoteBranch(g *gocui.Gui, v *gocui.View) error {
// some time need to fix, movement aint bad huh?
gui.nextRemote(g, v)
gui.previousRemote(g, v)
- if err = gui.updateRemoteBranches(g, entity); err != nil {
- return err
- }
- return nil
+ err = gui.updateRemoteBranches(g, entity)
+ return err
}
// iteration handler for the remotebranchview
@@ -64,10 +62,8 @@ func (gui *Gui) nextRemoteBranch(g *gocui.Gui, v *gocui.View) error {
if err = entity.Remote.NextRemoteBranch(); err != nil {
return err
}
- if err = gui.updateRemoteBranches(g, entity); err != nil {
- return err
- }
- return nil
+ err = gui.updateRemoteBranches(g, entity)
+ return err
}
// iteration handler for the remotebranchview
@@ -77,8 +73,6 @@ func (gui *Gui) previousRemoteBranch(g *gocui.Gui, v *gocui.View) error {
if err = entity.Remote.PreviousRemoteBranch(); err != nil {
return err
}
- if err = gui.updateRemoteBranches(g, entity); err != nil {
- return err
- }
- return nil
+ err = gui.updateRemoteBranches(g, entity)
+ return err
}
diff --git a/pkg/gui/remotesview.go b/pkg/gui/remotesview.go
index 55366b2..51323dc 100644
--- a/pkg/gui/remotesview.go
+++ b/pkg/gui/remotesview.go
@@ -68,8 +68,6 @@ func (gui *Gui) remoteChangeFollowUp(g *gocui.Gui, entity *git.RepoEntity) (err
if err = gui.updateRemotes(g, entity); err != nil {
return err
}
- if err = gui.updateRemoteBranches(g, entity); err != nil {
- return err
- }
- return nil
+ err = gui.updateRemoteBranches(g, entity)
+ return err
}
diff --git a/pkg/gui/stagedview.go b/pkg/gui/stagedview.go
index 3e83a96..e27d35d 100644
--- a/pkg/gui/stagedview.go
+++ b/pkg/gui/stagedview.go
@@ -43,10 +43,8 @@ func (gui *Gui) resetChanges(g *gocui.Gui, v *gocui.View) error {
if err := files[cy+oy].Reset(git.ResetOptions{}); err != nil {
return err
}
- if err := refreshAllStatusView(g, entity); err != nil {
- return err
- }
- return nil
+ err = refreshAllStatusView(g, entity)
+ return err
}
func (gui *Gui) resetAllChanges(g *gocui.Gui, v *gocui.View) error {
@@ -54,10 +52,8 @@ func (gui *Gui) resetAllChanges(g *gocui.Gui, v *gocui.View) error {
if err := entity.ResetAll(git.ResetOptions{}); err != nil {
return err
}
- if err := refreshAllStatusView(g, entity); err != nil {
- return err
- }
- return nil
+ err := refreshAllStatusView(g, entity)
+ return err
}
// refresh the main view and re-render the repository representations
diff --git a/pkg/gui/stashview.go b/pkg/gui/stashview.go
index cfdc104..54a05db 100644
--- a/pkg/gui/stashview.go
+++ b/pkg/gui/stashview.go
@@ -19,10 +19,8 @@ func (gui *Gui) openStashView(g *gocui.Gui) error {
v.Title = stashViewFeature.Title
}
entity := gui.getSelectedRepository()
- if err := refreshStashView(g, entity); err != nil {
- return err
- }
- return nil
+ err = refreshStashView(g, entity)
+ return err
}
//
@@ -36,10 +34,8 @@ func (gui *Gui) stashChanges(g *gocui.Gui, v *gocui.View) error {
return err
}
}
- if err := refreshAllStatusView(g, entity); err != nil {
- return err
- }
- return nil
+ err = refreshAllStatusView(g, entity)
+ return err
}
//
@@ -62,10 +58,8 @@ func (gui *Gui) popStash(g *gocui.Gui, v *gocui.View) error {
if err := entity.Refresh(); err != nil {
return err
}
- if err := refreshAllStatusView(g, entity); err != nil {
- return err
- }
- return nil
+ err = refreshAllStatusView(g, entity)
+ return err
}
// refresh the main view and re-render the repository representations
diff --git a/pkg/gui/statusview.go b/pkg/gui/statusview.go
index d95a56f..282d643 100644
--- a/pkg/gui/statusview.go
+++ b/pkg/gui/statusview.go
@@ -28,18 +28,14 @@ func (gui *Gui) openStatusView(g *gocui.Gui, v *gocui.View) error {
// focus to next view
func (gui *Gui) nextStatusView(g *gocui.Gui, v *gocui.View) error {
- if err := gui.nextViewOfGroup(g, v, statusViews); err != nil {
- return err
- }
- return nil
+ err := gui.nextViewOfGroup(g, v, statusViews)
+ return err
}
// focus to previous view
func (gui *Gui) previousStatusView(g *gocui.Gui, v *gocui.View) error {
- if err := gui.previousViewOfGroup(g, v, statusViews); err != nil {
- return err
- }
- return nil
+ err := gui.previousViewOfGroup(g, v, statusViews)
+ return err
}
// moves the cursor downwards for the main view and if it goes to bottom it
diff --git a/pkg/gui/unstagedview.go b/pkg/gui/unstagedview.go
index 93082cc..ef4866f 100644
--- a/pkg/gui/unstagedview.go
+++ b/pkg/gui/unstagedview.go
@@ -19,10 +19,8 @@ func (gui *Gui) openUnStagedView(g *gocui.Gui) error {
v.Title = unstageViewFeature.Title
}
entity := gui.getSelectedRepository()
- if err := refreshUnstagedView(g, entity); err != nil {
- return err
- }
- return nil
+ err = refreshUnstagedView(g, entity)
+ return err
}
func (gui *Gui) addChanges(g *gocui.Gui, v *gocui.View) error {
@@ -39,10 +37,8 @@ func (gui *Gui) addChanges(g *gocui.Gui, v *gocui.View) error {
if err := files[cy+oy].Add(git.AddOptions{}); err != nil {
return err
}
- if err := refreshAllStatusView(g, entity); err != nil {
- return err
- }
- return nil
+ err = refreshAllStatusView(g, entity)
+ return err
}
func (gui *Gui) addAllChanges(g *gocui.Gui, v *gocui.View) error {
@@ -50,10 +46,8 @@ func (gui *Gui) addAllChanges(g *gocui.Gui, v *gocui.View) error {
if err := entity.AddAll(git.AddOptions{}); err != nil {
return err
}
- if err := refreshAllStatusView(g, entity); err != nil {
- return err
- }
- return nil
+ err := refreshAllStatusView(g, entity)
+ return err
}
// refresh the main view and re-render the repository representations
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 06:29:55 +0000