diff options
Diffstat (limited to 'newRepo.go')
| -rw-r--r-- | newRepo.go | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -88,7 +88,6 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) { newRepo.hidden = false r.allrepos[pb.GetGoPath()] = newRepo - // newRepo.NewScan() newRepo.lastTag = r.reposgrid.NewLabel("") newRepo.masterVersion = r.reposgrid.NewLabel("") @@ -110,6 +109,9 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) { log.Log(WARN, "show diff masterVersion =", newRepo.masterVersion.String()) // newRepo.Status.XtermNohup([]string{"git diff"}) newRepo.Xterm("git diff; bash") + pb := newRepo.pb + pb.Reload() + newRepo.NewScan() r.reposbox.Enable() }) @@ -131,12 +133,13 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) { newRepo.XtermWait("git add --all") newRepo.XtermWait("git commit -a") newRepo.XtermWait("git push") - if newRepo.Status.CheckDirty() { - // commit was not done, restore diff + // this is paused here until the user closes the xterm window + if pb.CheckDirty() { + // commit was not actually done, restore the diff pb.RunRealtimeVerbose([]string{"git", "restore", "--staged", "."}) - } else { - newRepo.NewScan() } + pb.Reload() + newRepo.NewScan() r.reposbox.Enable() }) |