diff options
Diffstat (limited to 'gui/authenticationview.go')
| -rw-r--r-- | gui/authenticationview.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/authenticationview.go b/gui/authenticationview.go index 1b5c98f..97a214e 100644 --- a/gui/authenticationview.go +++ b/gui/authenticationview.go @@ -41,8 +41,8 @@ func (gui *Gui) openAuthenticationView(g *gocui.Gui, jobQueue *job.JobQueue, job return err } jobRequiresAuth = job - if job.Entity.State() != git.Fail { - if err := jobQueue.RemoveFromQueue(job.Entity); err != nil { + if job.Repository.State() != git.Fail { + if err := jobQueue.RemoveFromQueue(job.Repository); err != nil { log.Fatal(err.Error()) return err } @@ -53,7 +53,7 @@ func (gui *Gui) openAuthenticationView(g *gocui.Gui, jobQueue *job.JobQueue, job if err != gocui.ErrUnknownView { return err } - fmt.Fprintln(v, keySymbol+selectionIndicator+red.Sprint(jobRequiresAuth.Entity.Remote.URL[0])) + fmt.Fprintln(v, keySymbol+selectionIndicator+red.Sprint(jobRequiresAuth.Repository.Remote.URL[0])) } g.Cursor = true if err := gui.openUserView(g); err != nil { @@ -104,7 +104,7 @@ func (gui *Gui) submitAuthenticationView(g *gocui.Gui, v *gocui.View) error { switch mode := jobRequiresAuth.JobType; mode { case job.FetchJob: jobRequiresAuth.Options = command.FetchOptions{ - RemoteName: jobRequiresAuth.Entity.Remote.Name, + RemoteName: jobRequiresAuth.Repository.Remote.Name, Credentials: git.Credentials{ User: creduser, Password: credpswd, @@ -113,14 +113,14 @@ func (gui *Gui) submitAuthenticationView(g *gocui.Gui, v *gocui.View) error { case job.PullJob: // we handle pull as fetch&merge so same rule applies jobRequiresAuth.Options = command.PullOptions{ - RemoteName: jobRequiresAuth.Entity.Remote.Name, + RemoteName: jobRequiresAuth.Repository.Remote.Name, Credentials: git.Credentials{ User: creduser, Password: credpswd, }, } } - jobRequiresAuth.Entity.SetState(git.Queued) + jobRequiresAuth.Repository.SetState(git.Queued) // add this job to the last of the queue if err := gui.State.Queue.AddJob(jobRequiresAuth); err != nil { |
