From 7397c94d993541b33e555b758ebdb8f61ff33c6c Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Fri, 31 Aug 2018 13:18:03 +0200 Subject: make CLI commands use the cache to lock the repo properly --- termui/termui.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'termui/termui.go') diff --git a/termui/termui.go b/termui/termui.go index 91e92f00..581db670 100644 --- a/termui/termui.go +++ b/termui/termui.go @@ -3,7 +3,6 @@ package termui import ( "github.com/MichaelMure/git-bug/cache" "github.com/MichaelMure/git-bug/input" - "github.com/MichaelMure/git-bug/repository" "github.com/jroimartin/gocui" "github.com/pkg/errors" ) @@ -42,18 +41,12 @@ type window interface { } // Run will launch the termUI in the terminal -func Run(repo repository.Repo) error { - c, err := cache.NewRepoCache(repo) - - if err != nil { - return err - } - +func Run(cache *cache.RepoCache) error { ui = &termUI{ gError: make(chan error, 1), - cache: c, - bugTable: newBugTable(c), - showBug: newShowBug(c), + cache: cache, + bugTable: newBugTable(cache), + showBug: newShowBug(cache), msgPopup: newMsgPopup(), inputPopup: newInputPopup(), } @@ -62,7 +55,7 @@ func Run(repo repository.Repo) error { initGui(nil) - err = <-ui.gError + err := <-ui.gError if err != nil && err != gocui.ErrQuit { return err -- cgit