jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup mode handling

This commit is contained in:
Jeff Carr 2025-09-22 19:03:00 -05:00
parent 17a62eb8da
commit 3a967eac13
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.go
View File

@ -8,6 +8,7 @@ import (
"go.wit.com/lib/config" "go.wit.com/lib/config"
"go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/forgepb"
"go.wit.com/log"
) )
func forgeConfigSave() error { func forgeConfigSave() error {
@ -18,6 +19,7 @@ func setForgeMode(fmode forgepb.ForgeMode) {
if me.forge.Config.Mode == fmode { if me.forge.Config.Mode == fmode {
return return
} }
log.Info("changing mode", me.forge.Config.Mode, fmode)
me.forge.Config.Mode = fmode me.forge.Config.Mode = fmode
config.SetChanged("forge", true) config.SetChanged("forge", true)
me.forge.Config.ConfigSave() me.forge.Config.ConfigSave()

3
doCheckout.go
View File

@ -27,6 +27,7 @@ func doCheckout() error {
} }
if argv.Checkout.Devel != nil { if argv.Checkout.Devel != nil {
// setForgeMode(forgepb.ForgeMode_DEVEL)
if err := me.forge.DoAllCheckoutDevelNew(argv.Force); err != nil { if err := me.forge.DoAllCheckoutDevelNew(argv.Force); err != nil {
badExit(err) badExit(err)
} }
@ -34,7 +35,7 @@ func doCheckout() error {
} }
if argv.Checkout.Master != nil { if argv.Checkout.Master != nil {
setForgeMode(forgepb.ForgeMode_CLEAN) // disable "normal" mode if set setForgeMode(forgepb.ForgeMode_MASTER) // disable "normal" mode if set
if err := me.forge.DoAllCheckoutMaster(); err != nil { if err := me.forge.DoAllCheckoutMaster(); err != nil {
badExit(err) badExit(err)

1
main.go
View File

@ -73,7 +73,6 @@ func main() {
} }
if argv.Checkout != nil { if argv.Checkout != nil {
setForgeMode(forgepb.ForgeMode_DEVEL)
if err := doCheckout(); err != nil { if err := doCheckout(); err != nil {
badExit(err) badExit(err)
} }