diff options
Diffstat (limited to 'rill.go')
| -rw-r--r-- | rill.go | 55 |
1 files changed, 18 insertions, 37 deletions
@@ -5,7 +5,6 @@ package gitpb import ( "errors" - "strings" sync "sync" "github.com/destel/rill" @@ -17,46 +16,28 @@ var ErrorMissingGitConfig error = errors.New("missing .git/config") var ErrorGitPullOnLocal error = errors.New("git pull on local only branch") var ErrorGitPullOnDirty error = errors.New("cannot git pull on dirty repo") -func (repo *Repo) GitPull() cmd.Status { - currentName := repo.GetCurrentBranchName() - if repo.IsOnlyLocalTag(currentName) { - var result cmd.Status - result.Exit = 21 - result.Error = ErrorGitPullOnLocal - // log.Info("git pull skipped on local only branch", repo.GetGoPath()) - return result - } - var cmd []string - cmd = append(cmd, "git", "pull") - r := repo.Run(cmd) - // output := strings.Join(r.Stdout, "\n") - /* notsure why I had this. I think from a long time ago - if r.Error != nil { - output = "git error_,,,_a_,,,_b_,,,c" - } - */ +func (repo *Repo) GitPull() (*cmd.Status, error) { /* - if r.Error == nil { - if r.Exit == 0 { - log.Log(WARN, "git pull ran ", repo.GetGoPath()) - // log.Log(WARN, "git pull output", output) - return r - } else { - log.Log(WARN, "git pull error", repo.GetGoPath(), strings.Join(r.Stderr, "\n")) - return r - } + currentName := repo.GetCurrentBranchName() + if repo.IsOnlyLocalTag(currentName) { + var result cmd.Status + result.Exit = 21 + result.Error = ErrorGitPullOnLocal + // log.Info("git pull skipped on local only branch", repo.GetGoPath()) + return result } - log.Log(WARN, "git pull error", repo.GetGoPath(), r.Error) */ - return r + var cmd []string + cmd = append(cmd, "git", "pull") + return repo.RunVerbose(cmd) } // rill is awesome. long live rill // attempt scan with rill -func (all *Repos) RillGitPull(part1 int, part2 int) map[*Repo]cmd.Status { +func (all *Repos) RillGitPull(part1 int, part2 int) map[*Repo]*cmd.Status { var lock sync.Mutex - var allerr map[*Repo]cmd.Status - allerr = make(map[*Repo]cmd.Status) + var allerr map[*Repo]*cmd.Status + allerr = make(map[*Repo]*cmd.Status) // Convert a slice of user IDs into a channel ids := rill.FromSlice(all.Repos, nil) @@ -72,7 +53,7 @@ func (all *Repos) RillGitPull(part1 int, part2 int) map[*Repo]cmd.Status { counter += 1 if repo.CheckDirty() { // log.Info("git pull skipped on dirty repo", repo.GoPath) - var result cmd.Status + result := new(cmd.Status) result.Error = ErrorGitPullOnDirty lock.Lock() defer lock.Unlock() @@ -85,10 +66,10 @@ func (all *Repos) RillGitPull(part1 int, part2 int) map[*Repo]cmd.Status { dur = time.Duration((1+rand.Intn(50))*20) * time.Millisecond time.Sleep(dur) */ - var result cmd.Status - result = repo.GitPull() + var result *cmd.Status + result, _ = repo.GitPull() log.Info("git pull", repo.GetGoPath()) - log.Info(strings.Join(result.Stdout, "\n")) + // log.Info(strings.Join(result.Stdout, "\n")) lock.Lock() defer lock.Unlock() allerr[repo] = result |