93 lines
2.0 KiB
Go
93 lines
2.0 KiB
Go
package main
|
|
|
|
import (
|
|
"time"
|
|
|
|
"go.wit.com/lib/gui/shell"
|
|
"go.wit.com/lib/protobuf/gitpb"
|
|
"go.wit.com/log"
|
|
)
|
|
|
|
func rillPull(repo *gitpb.Repo) error {
|
|
if repo.IsDirty() {
|
|
// never do dirty repos
|
|
return nil
|
|
}
|
|
t, _ := repo.LastGitPull()
|
|
if time.Since(t) < time.Hour {
|
|
if argv.Verbose {
|
|
log.Info(repo.GetFullPath(), "git pulled too recently", shell.FormatDuration(time.Since(t)))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
var cmd []string
|
|
cmd = append(cmd, "git", "pull")
|
|
_, err := repo.RunVerbose(cmd)
|
|
if err != nil {
|
|
log.Info(repo.GetFullPath(), "git pull err:", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// is every repo on the devel branch?
|
|
|
|
func doGitPullNew() {
|
|
now := time.Now()
|
|
me.forge.RillFuncError(rillPull)
|
|
count := me.forge.RillReload()
|
|
if count != 0 {
|
|
me.forge.ConfigSave()
|
|
}
|
|
|
|
total, count, nope, _ := IsEverythingOnMaster()
|
|
log.Printf("Master branch check. %d total repos. (%d git pulled) (%d not on master branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now)))
|
|
}
|
|
|
|
/*
|
|
func doGitPull() {
|
|
allerr := me.found.RillGitPull(40, 5)
|
|
|
|
all := me.found.SortByFullPath()
|
|
for all.Scan() {
|
|
repo := all.Next()
|
|
result := allerr[repo]
|
|
if result.Error == gitpb.ErrorGitPullOnDirty {
|
|
log.Info("skip git pull. repo is dirty", repo.GetGoPath())
|
|
continue
|
|
}
|
|
if result.Error == gitpb.ErrorGitPullOnLocal {
|
|
log.Info("skip git pull. local branch ", repo.GetGoPath())
|
|
continue
|
|
}
|
|
if result.Exit == 0 {
|
|
continue
|
|
}
|
|
|
|
log.Info("git pull error:", repo.GetGoPath(), result.Error)
|
|
log.Info("git pull error:", repo.GetGoPath(), result.Stdout)
|
|
}
|
|
|
|
}
|
|
*/
|
|
|
|
// git fetch origin master:master
|
|
func rillFetchMaster(repo *gitpb.Repo) error {
|
|
if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
|
|
// only fetch when branch is on the user branch
|
|
return nil
|
|
}
|
|
branch := repo.GetMasterBranchName()
|
|
cmd := []string{"git", "fetch", "origin", branch + ":" + branch}
|
|
_, err := repo.RunVerbose(cmd)
|
|
return err
|
|
}
|
|
|
|
func doGitFetch() {
|
|
me.forge.RillFuncError(rillFetchMaster)
|
|
count := me.forge.RillReload()
|
|
if count != 0 {
|
|
me.forge.ConfigSave()
|
|
}
|
|
}
|