almost there on a first git am attempt

This commit is contained in:
Jeff Carr 2025-01-30 19:47:48 -06:00
parent 25fe17d59c
commit 5f0a271bf7
Notes: Jeff Carr 2025-01-30 20:05:09 -06:00
// `autogen:go.mod`

module go.wit.com/apps/forge

go 1.21

toolchain go1.23.4

require (
	go.wit.com/dev/alexflint/arg v1.5.5
	go.wit.com/gui v0.22.23
	go.wit.com/lib/gadgets v0.22.6
	go.wit.com/lib/gui/repolist v0.22.45
	go.wit.com/lib/gui/shell v0.22.23
	go.wit.com/lib/protobuf/forgepb v0.0.68
	go.wit.com/lib/protobuf/gitpb v0.0.70
	go.wit.com/log v0.22.10
)

require (
	github.com/destel/rill v0.6.0 // indirect
	github.com/go-cmd/cmd v1.4.3 // indirect
	go.wit.com/dev/alexflint/scalar v1.2.4 // indirect
	go.wit.com/lib/gui/repostatus v0.22.41 // indirect
	go.wit.com/lib/protobuf/zoopb v0.0.22 // indirect
	go.wit.com/widget v1.1.27 // indirect
	google.golang.org/protobuf v1.36.4 // indirect
)

// `autogen:go.sum`

github.com/destel/rill v0.6.0 h1:8MQRzS6k0akKmwNZFahKIhG1dkBeNxMoWKSfOxkaJNw=
github.com/destel/rill v0.6.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=
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.23 h1:bvbnV+o2YWeZsLT859PYUZKfouJepnNFwqbE17CfOmU=
go.wit.com/gui v0.22.23/go.mod h1:BLB9puy4uNoJYA4WB5LBc7aB3mXavgh4mVLB36WuiTk=
go.wit.com/lib/gadgets v0.22.6 h1:7ajBzCRftjZ170aa+QLhxuIL4eXK76kFLATD3tkxcKY=
go.wit.com/lib/gadgets v0.22.6/go.mod h1:3eMOLDlSyY6vohlUheTCB74PwYxhpHkX1KGZXTSOgdE=
go.wit.com/lib/gui/repolist v0.22.45 h1:JAZmkt/HS7tC9hKRHBly9cD3aIiEUPT2Fabjvyp5WbM=
go.wit.com/lib/gui/repolist v0.22.45/go.mod h1:L4hLjRdA0Gw0BK2oekLbscRPVSSHcGPRRsF2ZEPubpA=
go.wit.com/lib/gui/repostatus v0.22.41 h1:X1Yvm5/GGj6N/ujQMxZ4h96b7W1cMcZhqSFRjQzwWeU=
go.wit.com/lib/gui/repostatus v0.22.41/go.mod h1:KRtyOuNEqM5LPWGgbl6wJAolIGTFaU5AVhHraKjnNeY=
go.wit.com/lib/gui/shell v0.22.23 h1:U6Njsme2NU7ntcopcSXHD9bNYZzzeQueSTRB/L1YrgE=
go.wit.com/lib/gui/shell v0.22.23/go.mod h1:K6+ULaS8xQFcsi1QoWHY1+PM/vS+IRSyJvbnJF9GyIQ=
go.wit.com/lib/protobuf/forgepb v0.0.68 h1:VpI5oIIH7N930nNOBtQVRn9aIIvj4RjS7tbj6AKGHPQ=
go.wit.com/lib/protobuf/forgepb v0.0.68/go.mod h1:pcLwYi2Ucj0yA4UVguUmhYAtou6xYnxUmHn6jqV9+Bg=
go.wit.com/lib/protobuf/gitpb v0.0.70 h1:zyDxvXBtNGiEEOh2I6MFQN3Awvjf/oO0N4waPzZT4G0=
go.wit.com/lib/protobuf/gitpb v0.0.70/go.mod h1:zlLM/+9vajrXNVbczpoyYIraLokZ6My47wDgqo9Gobg=
go.wit.com/lib/protobuf/zoopb v0.0.22 h1:tAFwRGMepMz+AsEehtwW5mO7ljXspQCcY3qTOT/EgXI=
go.wit.com/lib/protobuf/zoopb v0.0.22/go.mod h1:iEec6TXYJjaeShv+vOfCuw/3uWnfm35ongl19T2l0v0=
go.wit.com/log v0.22.10 h1:rlSgaYjvxbpcmi9UBQO3ESmbd/jiyFdRQFoGOvpCEUc=
go.wit.com/log v0.22.10/go.mod h1:4uNPFBqhsAh8zNF+zxVEmC3c/9AZ8JeTfUUvRpddvLQ=
go.wit.com/widget v1.1.27 h1:Yd+qp6GZVwLiTTepShXSeWSDqjaCxLyfhU0ch2FrPZ8=
go.wit.com/widget v1.1.27/go.mod h1:OXIdWk7GhVJRLnHTvf45LbPNXGYG/JjbkfnmXtkoiYE=
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.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

// `autogen:`
3 changed files with 48 additions and 25 deletions

View File

@ -7,6 +7,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"go.wit.com/lib/gui/shell"
"go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/forgepb"
"go.wit.com/lib/protobuf/gitpb" "go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log" "go.wit.com/log"
@ -89,6 +90,23 @@ func applyPatchset(pset *forgepb.Patchset) error {
log.Info(fullname, "save failed", err) log.Info(fullname, "save failed", err)
continue continue
} else { } else {
basedir, filename := filepath.Split(fullname)
cmd := []string{"git", "am", filename}
log.Info("Should run: at", basedir, ":", cmd)
log.Info(basedir, filename)
result := shell.PathRun(basedir, cmd)
/*
if err != nil {
log.Info("git am failed", err)
}
*/
for _, line := range result.Stdout {
log.Warn("stdout:", line)
}
for _, line := range result.Stderr {
log.Warn("stderr:", line)
}
}
/* /*
// log.Info("pset filename FILENAME IS REAL?", p.Filename, pset.Name, pset.Comment) // log.Info("pset filename FILENAME IS REAL?", p.Filename, pset.Name, pset.Comment)
basepath, filename := filepath.Split(p.Filename) basepath, filename := filepath.Split(p.Filename)
@ -109,16 +127,12 @@ func applyPatchset(pset *forgepb.Patchset) error {
raw.Close() raw.Close()
*/ */
/* /*
FIX THIS
cmd := []string{"git", "am", fullname}
result := shell.PathRun(fullpath, cmd) result := shell.PathRun(fullpath, cmd)
if result.Exit != 0 { if result.Exit != 0 {
log.Info("cmd failed", cmd, result.Exit) log.Info("cmd failed", cmd, result.Exit)
everythingworked = false everythingworked = false
} }
*/ */
}
// until 'git am' works
everythingworked = false everythingworked = false
} }
if everythingworked { if everythingworked {

View File

@ -161,5 +161,13 @@ func doPatchGet() error {
return err return err
} }
log.Info("Got Patchsets ok", psets.Uuid) log.Info("Got Patchsets ok", psets.Uuid)
log.Info("got psets len", len(psets.Patchsets))
all := psets.SortByName()
for all.Scan() {
pset := all.Next()
// log.Info("pset name =", pset.Name)
dumpPatchset(pset)
}
return nil return nil
} }

View File

@ -154,6 +154,7 @@ func (r *patchesWindow) addPatchsetNew(pset *forgepb.Patchset) {
r.psetgrid.NewLabel(pset.Name) r.psetgrid.NewLabel(pset.Name)
r.psetgrid.NewLabel(pset.Comment) r.psetgrid.NewLabel(pset.Comment)
r.psetgrid.NewLabel(pset.GitAuthorName) r.psetgrid.NewLabel(pset.GitAuthorName)
// r.psetgrid.NewLabel(pset.RepoNamespace)
if pset.State == "BROKEN" { if pset.State == "BROKEN" {
r.psetgrid.NewLabel("Bad") r.psetgrid.NewLabel("Bad")
} else { } else {