diff options
| author | Michael Muré <batolettre@gmail.com> | 2019-02-24 12:58:04 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2019-03-01 22:48:50 +0100 |
| commit | e100ee9f10dd7f600b58bf3d24b36f9b286210d6 (patch) | |
| tree | 0df0fb14642aeda9b21564112b5a876fc64b8990 /termui | |
| parent | b59623a835f1f922d06ff7212b5bf7825624d134 (diff) | |
| download | git-bug-e100ee9f10dd7f600b58bf3d24b36f9b286210d6.tar.gz | |
github: fix 3 edge-case failures
Diffstat (limited to 'termui')
| -rw-r--r-- | termui/label_select.go | 2 | ||||
| -rw-r--r-- | termui/show_bug.go | 6 | ||||
| -rw-r--r-- | termui/termui.go | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/termui/label_select.go b/termui/label_select.go index 026eba04..131703f9 100644 --- a/termui/label_select.go +++ b/termui/label_select.go @@ -296,7 +296,7 @@ func (ls *labelSelect) saveAndReturn(g *gocui.Gui, v *gocui.View) error { } } - if _, err := ls.bug.ChangeLabels(newLabels, rmLabels); err != nil { + if _, _, err := ls.bug.ChangeLabels(newLabels, rmLabels); err != nil { ui.msgPopup.Activate(msgPopupErrorTitle, err.Error()) } diff --git a/termui/show_bug.go b/termui/show_bug.go index 55d86018..733c801e 100644 --- a/termui/show_bug.go +++ b/termui/show_bug.go @@ -622,9 +622,11 @@ func (sb *showBug) setTitle(g *gocui.Gui, v *gocui.View) error { func (sb *showBug) toggleOpenClose(g *gocui.Gui, v *gocui.View) error { switch sb.bug.Snapshot().Status { case bug.OpenStatus: - return sb.bug.Close() + _, err := sb.bug.Close() + return err case bug.ClosedStatus: - return sb.bug.Open() + _, err := sb.bug.Open() + return err default: return nil } diff --git a/termui/termui.go b/termui/termui.go index 78900de8..54d9df69 100644 --- a/termui/termui.go +++ b/termui/termui.go @@ -226,7 +226,7 @@ func addCommentWithEditor(bug *cache.BugCache) error { if err == input.ErrEmptyMessage { ui.msgPopup.Activate(msgPopupErrorTitle, "Empty message, aborting.") } else { - err := bug.AddComment(message) + _, err := bug.AddComment(message) if err != nil { return err } @@ -261,7 +261,7 @@ func editCommentWithEditor(bug *cache.BugCache, target git.Hash, preMessage stri } else if message == preMessage { ui.msgPopup.Activate(msgPopupErrorTitle, "No changes found, aborting.") } else { - err := bug.EditComment(target, message) + _, err := bug.EditComment(target, message) if err != nil { return err } @@ -298,7 +298,7 @@ func setTitleWithEditor(bug *cache.BugCache) error { } else if title == snap.Title { ui.msgPopup.Activate(msgPopupErrorTitle, "No change, aborting.") } else { - err := bug.SetTitle(title) + _, err := bug.SetTitle(title) if err != nil { return err } |