should help race conditions

This commit is contained in:
Jeff Carr 2025-01-30 18:00:03 -06:00
parent d568d5dbe4
commit fa5c6572ff
Notes: Jeff Carr 2025-02-15 19:01:13 -06:00
// `autogen:go.mod`

module go.wit.com/lib/gui/repostatus

go 1.22

toolchain go1.23.6

require (
	go.wit.com/gui v0.22.26
	go.wit.com/lib/gadgets v0.22.9
	go.wit.com/lib/gui/shell v0.22.26
	go.wit.com/lib/protobuf/gitpb v0.0.80
	go.wit.com/lib/protobuf/virtbuf v0.2.20
	go.wit.com/log v0.22.16
)

require (
	github.com/destel/rill v0.7.0 // indirect
	github.com/go-cmd/cmd v1.4.3 // indirect
	github.com/google/uuid v1.6.0 // indirect
	go.wit.com/dev/alexflint/arg v1.5.5 // indirect
	go.wit.com/dev/alexflint/scalar v1.2.4 // indirect
	go.wit.com/lib/protobuf/guipb v0.0.2 // indirect
	go.wit.com/widget v1.1.29 // indirect
	google.golang.org/protobuf v1.36.5 // indirect
)

// `autogen:go.sum`

github.com/destel/rill v0.7.0 h1:LJUbeMACaO+/e8rUNk940kYVESD/dbrhAp6M14IjQ0c=
github.com/destel/rill v0.7.0/go.mod h1:srKuXzvGqINUEGYR5b/iwvW+L9/S35RxVHWGYbXNoO4=
github.com/go-cmd/cmd v1.4.3 h1:6y3G+3UqPerXvPcXvj+5QNPHT02BUw7p6PsqRxLNA7Y=
github.com/go-cmd/cmd v1.4.3/go.mod h1:u3hxg/ry+D5kwh8WvUkHLAMe2zQCaXd00t35WfQaOFk=
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
go.wit.com/dev/alexflint/arg v1.5.5 h1:c4jgIb4OvHjnCMRNSjOa1sNLl6WDxV6tIkMVezR9hCk=
go.wit.com/dev/alexflint/arg v1.5.5/go.mod h1:nH3F6TJDaAUgnLkC0WgRN/H047YfN1TYKaWPYr6B8lo=
go.wit.com/dev/alexflint/scalar v1.2.4 h1:zmBeEkObwz1lcelwfGNYP2GS6SQ9e0tdv7JdHwMZEEk=
go.wit.com/dev/alexflint/scalar v1.2.4/go.mod h1:kCNO1Fo5LnnK6+qa+zYhP5fdgfC1C+vx1ti99Md+FAM=
go.wit.com/gui v0.22.26 h1:HtdV1kx6wHpCTyS67s2KdMCyX6teNXIQOk1NyX6o8bY=
go.wit.com/gui v0.22.26/go.mod h1:6OVZofoS43VNUiQWR0aJkXEcqpuIhERJQnxhdGrEsHo=
go.wit.com/lib/gadgets v0.22.9 h1:NUrPSCWwFMzt5iXNkEIh9tTkWX6f/4jrCoWosmFmKD8=
go.wit.com/lib/gadgets v0.22.9/go.mod h1:Gf3TM674Nu73xKJzWqindIM43IXPzACB/+YH+NMrh+c=
go.wit.com/lib/gui/shell v0.22.26 h1:F+7aadEujsTgyBEs5ptKGL6N72reDkGd/7b0Ju4HeTU=
go.wit.com/lib/gui/shell v0.22.26/go.mod h1:Km5o+DLU5up5jvTEum9wiTdsZZG/EUNERVzn2wJ6DBE=
go.wit.com/lib/protobuf/gitpb v0.0.80 h1:5AeyG0BVLKWzU9zUt4doEDa7eEh+UKWGEcE1ibhSgqM=
go.wit.com/lib/protobuf/gitpb v0.0.80/go.mod h1:fsefHgERvcJpQ4YMGYOVM7lep+yYH+LsLJolhVWCrjc=
go.wit.com/lib/protobuf/guipb v0.0.2 h1:ZR4cLy+XheRQEFLlissBmASJDqiLfHaAluF6wYbVuOo=
go.wit.com/lib/protobuf/guipb v0.0.2/go.mod h1:mZsirb7zRgsE2IGHuvHkG7j85hkrGZl3NAALOEkjowA=
go.wit.com/lib/protobuf/virtbuf v0.2.20 h1:SqBp6lR9mFQF52sWBObz2g8l4o57ZYWyZ6BjXhx0uV0=
go.wit.com/lib/protobuf/virtbuf v0.2.20/go.mod h1:3H0gOh05q7DQ6ziX/nW0zpkljxE8ZQpAHBPh0Tw4Z78=
go.wit.com/log v0.22.16 h1:E0Vd0Z2ILtfjhs7J/CQ4g13DK1jtQiYl6l5KOBGsZoA=
go.wit.com/log v0.22.16/go.mod h1:/c5Uj30sWRQ4B5ei2ElB6Q8Si/cK6v+KbxnH208KD84=
go.wit.com/widget v1.1.29 h1:rURM/N1hbrl0btGlBIUx0SCre9jj+hshvkBLMMa008I=
go.wit.com/widget v1.1.29/go.mod h1:wj7TpAr2gk7Poa+v8XQkH1aidnTdgAa/a8GxrMtcztw=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

// `autogen:`
1 changed files with 10 additions and 0 deletions

View File

@ -103,6 +103,8 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
grid.NextRow()
grid.NewButton("checkout user", func() {
w.Disable()
defer w.Enable()
if err := repo.CheckoutUser(); err != nil {
log.Info(repo.GetFullPath(), err)
}
@ -111,11 +113,15 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
})
grid.NextRow()
grid.NewButton("checkout devel", func() {
w.Disable()
defer w.Enable()
repo.CheckoutDevel()
w.repo.Reload()
w.Update()
})
w.mergeD = grid.NewButton("merge to devel", func() {
w.Disable()
defer w.Enable()
log.Info("repo:", repo.GetGoPath())
if result, err := repo.MergeToDevel(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath())
@ -140,11 +146,15 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
})
grid.NextRow()
grid.NewButton("checkout master", func() {
w.Disable()
defer w.Enable()
repo.CheckoutMaster()
w.repo.Reload()
w.Update()
})
w.mergeM = grid.NewButton("merge to master", func() {
w.Disable()
defer w.Enable()
log.Info("repo:", repo.GetGoPath())
if result, err := repo.MergeToMaster(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath())