diff options
Diffstat (limited to 'repolist.go')
| -rw-r--r-- | repolist.go | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/repolist.go b/repolist.go index 956f03a..bf27bb5 100644 --- a/repolist.go +++ b/repolist.go @@ -134,22 +134,22 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri newRepo.endBox.NewButton("show diff", func() { me.reposwin.Disable() - newRepo.status.XtermNohup([]string{"git diff"}) + // newRepo.status.XtermNohup([]string{"git diff"}) + newRepo.status.Xterm("git diff; bash") me.reposwin.Enable() }) newRepo.endBox.NewButton("commit all", func() { me.reposwin.Disable() // restore anything staged so everything can be reviewed - newRepo.status.Xterm([]string{"git restore --staged ."}) - // newRepo.status.Xterm([]string{"git diff"}) - newRepo.status.Xterm([]string{"git add --all"}) - newRepo.status.XtermNohup([]string{"git diff --cached"}) - newRepo.status.Xterm([]string{"git commit -a"}) - newRepo.status.Xterm([]string{"git push"}) + newRepo.status.RunCmd([]string{"git", "restore", "--staged", "."}) + newRepo.status.XtermWait("git diff") + newRepo.status.XtermWait("git add --all") + newRepo.status.XtermWait("git commit -a") + newRepo.status.XtermWait("git push") if newRepo.status.CheckDirty() { // commit was not done, restore diff - newRepo.status.Xterm([]string{"git restore --staged ."}) + newRepo.status.RunCmd([]string{"git", "restore", "--staged", "."}) } else { newRepo.status.Update() newRepo.newScan() @@ -231,13 +231,18 @@ func repolistWindow() { me.reposgrid.NextRow() } - for i, path := range repostatus.ListGitDirectories() { - // log.Info("addRepo()", i, path) - tmp := strings.TrimPrefix(path, me.goSrcPwd.String()) - path = strings.Trim(tmp, "/") - log.Info("addRepo()", i, path) - addRepo(me.reposgrid, path, "master", "devel", usr.Username) - me.reposgrid.NextRow() + if args.OnlyMe { + log.Info("not scanning everything") + } else { + log.Info("scanning everything in ~/go/src") + for i, path := range repostatus.ListGitDirectories() { + // log.Info("addRepo()", i, path) + tmp := strings.TrimPrefix(path, me.goSrcPwd.String()) + path = strings.Trim(tmp, "/") + log.Info("addRepo()", i, path) + addRepo(me.reposgrid, path, "master", "devel", usr.Username) + me.reposgrid.NextRow() + } } } @@ -315,7 +320,7 @@ func repoAllButtons(box *gui.Node) { log.Info("build worked", repo.String()) } else { log.Info("build failed", repo.String()) - go repo.status.Xterm([]string{"bash"}) + go repo.status.Xterm("bash") return } } |