93 lines
2.4 KiB
Go
93 lines
2.4 KiB
Go
package gitpb
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/go-cmd/cmd"
|
|
"go.wit.com/log"
|
|
)
|
|
|
|
func (r *Repo) MergeToDevel() (*cmd.Status, error) {
|
|
r.Reload()
|
|
if r.GetCurrentBranchName() != r.GetDevelBranchName() {
|
|
return nil, fmt.Errorf("repo not on devel branch")
|
|
}
|
|
if r.CheckDirty() {
|
|
return nil, fmt.Errorf("repo is dirty")
|
|
}
|
|
devel := r.GetDevelBranchName()
|
|
user := r.GetUserBranchName()
|
|
|
|
log.Info(r.FullPath, "MergeToDevel() merging from", user, "into", devel)
|
|
|
|
cmd := []string{"git", "merge", user}
|
|
result := r.RunRealtimeVerbose(cmd)
|
|
if result.Error != nil {
|
|
log.Log(WARN, "MergeToDevel() failed", r.GetFullPath())
|
|
return nil, result.Error
|
|
}
|
|
|
|
if !r.IsBranchRemote(devel) {
|
|
r.Reload() // rescan the repo
|
|
// devel branch is not remote. do not try 'git push'
|
|
return nil, nil
|
|
}
|
|
|
|
// it seems like we have write access. lets find out!
|
|
cmd = []string{"git", "push"}
|
|
result = r.RunRealtimeVerbose(cmd)
|
|
if result.Error != nil {
|
|
log.Log(WARN, "GitPushToDevel() failed", r.GetFullPath())
|
|
return nil, result.Error
|
|
}
|
|
r.Reload() // rescan the repo
|
|
return nil, nil
|
|
}
|
|
|
|
func (r *Repo) MergeToMaster() (*cmd.Status, error) {
|
|
r.Reload()
|
|
|
|
if r.GetCurrentBranchName() != r.GetMasterBranchName() {
|
|
return nil, fmt.Errorf("repo not on master branch")
|
|
}
|
|
/*
|
|
if r.GetReadOnly() {
|
|
r.Reload() // rescan the repo
|
|
// master branch is read only. you can not git push
|
|
lh := r.GetLocalHash("devel")
|
|
rh := r.GetRemoteHash("devel")
|
|
if lh == rh {
|
|
// log.Info(r.FullPath, "local devel == remote devel", lh, rh)
|
|
} else {
|
|
log.Info(r.FullPath, "local devel != remote devel", lh, rh)
|
|
}
|
|
log.Info("can't merge to master on read only() repos. trying anyway")
|
|
// return nil, fmt.Errorf("can't merge to master on read only() repos")
|
|
}
|
|
*/
|
|
if r.CheckDirty() {
|
|
return nil, fmt.Errorf("repo is dirty")
|
|
}
|
|
master := r.GetMasterBranchName()
|
|
devel := r.GetDevelBranchName()
|
|
|
|
log.Info("MergeToMaster() merging from", devel, "into", master)
|
|
|
|
cmd := []string{"git", "merge", devel}
|
|
result := r.RunRealtimeVerbose(cmd)
|
|
if result.Error != nil {
|
|
log.Log(WARN, "MergeToMaster() failed", r.GetFullPath())
|
|
return nil, result.Error
|
|
}
|
|
|
|
// it seems like we have write access. lets find out!
|
|
cmd = []string{"git", "push"}
|
|
result = r.RunRealtimeVerbose(cmd)
|
|
if result.Error != nil {
|
|
log.Log(WARN, "GitPushToMaster() failed", r.GetFullPath())
|
|
return nil, result.Error
|
|
}
|
|
r.Reload() // rescan the repo
|
|
return nil, nil
|
|
}
|