finally rename back to 'Update'
This commit is contained in:
parent
e1e81ab2bf
commit
2a19cd5eef
|
@ -36,7 +36,7 @@ func (rs *RepoStatus) makeBranchesBox(parent *gui.Node) {
|
||||||
} else {
|
} else {
|
||||||
log.Info("branch switched to", bname, "failed")
|
log.Info("branch switched to", bname, "failed")
|
||||||
}
|
}
|
||||||
rs.UpdateNew()
|
rs.updateNew()
|
||||||
})
|
})
|
||||||
|
|
||||||
rs.targetBranch = newgrid.NewDropdown() // `progname:"TARGET"`
|
rs.targetBranch = newgrid.NewDropdown() // `progname:"TARGET"`
|
||||||
|
|
|
@ -119,7 +119,7 @@ func (rs *RepoStatus) parseGoSum() (bool, error) {
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rs *RepoStatus) GoConfig() map[string]string {
|
func (rs *RepoStatus) GoConfig() map[string]string {
|
||||||
return rs.goConfig
|
return rs.goConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,3 +157,10 @@ func (rs *RepoStatus) MakeRedomod() (bool, error) {
|
||||||
// return the attempt to parse go.mod & go.sum
|
// return the attempt to parse go.mod & go.sum
|
||||||
return rs.parseGoSum()
|
return rs.parseGoSum()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (rs *RepoStatus) IsReleased() bool {
|
||||||
|
if rs.GetTargetVersion() == rs.GetCurrentVersion() {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
8
merge.go
8
merge.go
|
@ -22,11 +22,11 @@ func (rs *RepoStatus) MergeUserToDevel() bool {
|
||||||
|
|
||||||
if rs.DoAll(all) {
|
if rs.DoAll(all) {
|
||||||
log.Log(WARN, "MergeUserToDevel() failed", rs.Path())
|
log.Log(WARN, "MergeUserToDevel() failed", rs.Path())
|
||||||
rs.UpdateNew()
|
rs.updateNew()
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
// DoAll failed
|
// DoAll failed
|
||||||
rs.UpdateNew()
|
rs.updateNew()
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,11 +44,11 @@ func (rs *RepoStatus) MergeDevelToMaster() bool {
|
||||||
|
|
||||||
if rs.DoAll(all) {
|
if rs.DoAll(all) {
|
||||||
log.Log(WARN, "MergeDevelToMaster() failed", rs.Path())
|
log.Log(WARN, "MergeDevelToMaster() failed", rs.Path())
|
||||||
rs.UpdateNew()
|
rs.updateNew()
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
// DoAll failed
|
// DoAll failed
|
||||||
rs.UpdateNew()
|
rs.updateNew()
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
|
||||||
newgrid := rs.gitCommandsGroup.NewGrid("gridnuts", 0, 0)
|
newgrid := rs.gitCommandsGroup.NewGrid("gridnuts", 0, 0)
|
||||||
|
|
||||||
newgrid.NewButton("Rescan Repo", func() {
|
newgrid.NewButton("Rescan Repo", func() {
|
||||||
rs.UpdateNew()
|
rs.Update()
|
||||||
})
|
})
|
||||||
|
|
||||||
newgrid.NewButton("CheckDirty()", func() {
|
newgrid.NewButton("CheckDirty()", func() {
|
||||||
|
|
|
@ -25,7 +25,7 @@ type RepoStatus struct {
|
||||||
dirtyLabel *gadgets.OneLiner
|
dirtyLabel *gadgets.OneLiner
|
||||||
readOnly *gadgets.OneLiner
|
readOnly *gadgets.OneLiner
|
||||||
gitState *gadgets.OneLiner
|
gitState *gadgets.OneLiner
|
||||||
primitive *gadgets.OneLiner
|
primitive *gadgets.OneLiner
|
||||||
|
|
||||||
path *gadgets.OneLiner
|
path *gadgets.OneLiner
|
||||||
goSrcPath *gadgets.OneLiner
|
goSrcPath *gadgets.OneLiner
|
||||||
|
|
|
@ -23,7 +23,7 @@ func (rs *RepoStatus) gitBranchAll() {
|
||||||
// log.Log(WARN, "branch count =", i)
|
// log.Log(WARN, "branch count =", i)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rs *RepoStatus) UpdateNew() {
|
func (rs *RepoStatus) updateNew() {
|
||||||
if !rs.Ready() {
|
if !rs.Ready() {
|
||||||
log.Log(WARN, "can't update yet. ready is false")
|
log.Log(WARN, "can't update yet. ready is false")
|
||||||
log.Error(errors.New("Update() is not ready yet"))
|
log.Error(errors.New("Update() is not ready yet"))
|
||||||
|
@ -79,7 +79,7 @@ func (rs *RepoStatus) Update() {
|
||||||
}
|
}
|
||||||
log.Log(INFO, "Update() START")
|
log.Log(INFO, "Update() START")
|
||||||
duration := timeFunction(func() {
|
duration := timeFunction(func() {
|
||||||
rs.UpdateNew()
|
rs.updateNew()
|
||||||
})
|
})
|
||||||
rs.setSpeed(duration)
|
rs.setSpeed(duration)
|
||||||
log.Log(INFO, "Update() END")
|
log.Log(INFO, "Update() END")
|
||||||
|
|
Loading…
Reference in New Issue