diff options
author | mjarkk <mkopenga@gmail.com> | 2018-12-10 13:45:03 +0100 |
---|---|---|
committer | mjarkk <mkopenga@gmail.com> | 2018-12-10 13:45:03 +0100 |
commit | 76e9582739c329fa657b327254bf010c560ac5e8 (patch) | |
tree | 3a4aa87e4ff66c986974b792ef68ecefa396f758 /pkg/gui/gui.go | |
parent | 50f20de8f34b53b808710e91fea501cb1e26ff89 (diff) |
Not always git fetch
Diffstat (limited to 'pkg/gui/gui.go')
-rw-r--r-- | pkg/gui/gui.go | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index a8a393620..3345be560 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -73,7 +73,7 @@ type Gui struct { Updater *updates.Updater statusManager *statusManager credentials credentials - introAgree sync.WaitGroup + waitForIntro sync.WaitGroup } // for now the staging panel state, unlike the other panel states, is going to be @@ -387,6 +387,7 @@ func (gui *Gui) layout(g *gocui.Gui) error { if err := gui.updateRecentRepoList(); err != nil { return err } + gui.waitForIntro.Done() if _, err := gui.g.SetCurrentView(filesView.Name()); err != nil { return err @@ -422,16 +423,15 @@ func (gui *Gui) layout(g *gocui.Gui) error { // if you download humanlog and do tail -f development.log | humanlog // this will let you see these branches as prettified json // gui.Log.Info(utils.AsJson(gui.State.Branches[0:4])) - return gui.resizeCurrentPopupPanel(g) } func (gui *Gui) promptAnonymousReporting() error { return gui.createConfirmationPanel(gui.g, nil, gui.Tr.SLocalize("AnonymousReportingTitle"), gui.Tr.SLocalize("AnonymousReportingPrompt"), func(g *gocui.Gui, v *gocui.View) error { - gui.introAgree.Done() + gui.waitForIntro.Done() return gui.Config.WriteToUserConfig("reporting", "on") }, func(g *gocui.Gui, v *gocui.View) error { - gui.introAgree.Done() + gui.waitForIntro.Done() return gui.Config.WriteToUserConfig("reporting", "off") }) } @@ -509,13 +509,19 @@ func (gui *Gui) Run() error { } if gui.Config.GetUserConfig().GetString("reporting") == "undetermined" { - gui.introAgree.Add(1) + gui.waitForIntro.Add(2) + } else { + gui.waitForIntro.Add(1) } go func() { + gui.waitForIntro.Wait() + isNew := gui.Config.GetIsNewRepo() + if !isNew { + time.After(60 * time.Second) + } _, err := gui.fetch(g, g.CurrentView(), false) - if err != nil && strings.Contains(err.Error(), "exit status 128") && gui.IsNewPrivateRepo() { - gui.introAgree.Wait() + if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew { _ = gui.createConfirmationPanel(g, g.CurrentView(), gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil) } else { gui.goEvery(g, time.Second*60, func(g *gocui.Gui) error { |