tring to fix go-clone

This commit is contained in:
Jeff Carr 2024-12-15 12:14:48 -06:00
parent 5c1bebb16c
commit 5006d718fd
Notes: Jeff Carr 2024-12-15 12:28:51 -06:00
// `autogen:go.mod`

module go.wit.com/lib/protobuf/gitpb

go 1.21

toolchain go1.23.4

require (
	github.com/destel/rill v0.6.0
	github.com/go-cmd/cmd v1.4.3
	go.wit.com/lib/gui/shell v0.22.17
	go.wit.com/log v0.22.9
	google.golang.org/protobuf v1.35.2
)

// `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/lib/gui/shell v0.22.17 h1:JfGozzkhrlCDCtQCVgVExobvseFc2ZIM9r76cXCouwg=
go.wit.com/lib/gui/shell v0.22.17/go.mod h1:zduuMSWq+EE7w0xbXn+vkoGZ4HJhURVJpvXw8oK9WAU=
go.wit.com/log v0.22.9 h1:aBM6SI2kxlJcBfS/osFTomJqNhO0hfEo1gk+LCqLk7Y=
go.wit.com/log v0.22.9/go.mod h1:4uNPFBqhsAh8zNF+zxVEmC3c/9AZ8JeTfUUvRpddvLQ=
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.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

// `autogen:`
2 changed files with 95 additions and 15 deletions

View File

@ -7,29 +7,46 @@ import (
"time"
)
// checks to see if the go.sum and go.mod files
// match the repo.pb information
// checks to see if the go.sum and go.mod files exist
// also check for a match with the repo.pb GoPrimitive bool
// todo: check mtime
func (repo *Repo) ValidGoSum() error {
if !repo.Exists("go.mod") {
return errors.New("ValidGoSum() go.mod is missing")
}
if repo.GoPrimitive {
if !repo.Exists("go.mod") {
return errors.New("GoPrimitive == true, but go.mod is missing")
}
// repo thinks it is primitive but has a go.sum file
if repo.Exists("go.sum") {
return errors.New("GoPrimitive == true, but go.sum exists")
}
mtime, err := repo.mtime("go.mod")
if err == nil {
return err
}
if mtime != repo.LastGoDep.AsTime() {
return errors.New("go.mod mtime mis-match")
}
/*
// todo: fix this
mtime, err := repo.mtime("go.mod")
if err == nil {
return err
}
if mtime != repo.LastGoDep.AsTime() {
return errors.New("go.mod mtime mis-match")
}
*/
return nil
}
mtime, err := repo.mtime("go.sum")
if err == nil {
return err
}
if mtime != repo.LastGoDep.AsTime() {
return errors.New("go.sum mtime mis-match")
if !repo.Exists("go.sum") {
return errors.New("ValidGoSum() go.sum is missing")
}
/*
mtime, err := repo.mtime("go.sum")
// todo: fix this
if err == nil {
return err
}
if mtime != repo.LastGoDep.AsTime() {
return errors.New("go.sum mtime mis-match")
}
*/
return nil
}

63
isTracked.go Normal file
View File

@ -0,0 +1,63 @@
package gitpb
import (
"fmt"
)
func (repo *Repo) isTracked(file string) (bool, error) {
cmd := []string{"git", "ls-files", "--error-unmatch", file}
result := repo.Run(cmd)
if result.Error != nil {
return false, result.Error
}
if result.Exit != 0 {
return false, nil
}
return true, nil
}
func (repo *Repo) isIgnored(file string) (bool, error) {
cmd := []string{"git", "check-ignore", "-q", file}
result := repo.Run(cmd)
if result.Error != nil {
return false, result.Error
}
if result.Exit == 0 {
// exit with 0 means the file is ignored
return true, nil
}
// non-zero exit means the file is not ignored
return false, nil
}
func (repo *Repo) RepoIgnoresGoMod() (bool, error) {
file := "go.mod"
if tracked, err := repo.isTracked(file); err != nil {
fmt.Printf("%s Error checking if %s tracked: %v\n", repo.GoPath, file, err)
return false, err
} else {
if tracked {
fmt.Printf("%s %s is tracked by Git.\n", repo.GoPath, file)
return false, nil
}
}
if ignored, err := repo.isIgnored(file); err != nil {
if err != nil {
fmt.Printf("%s Error checking if ignored: %v\n", repo.GoPath, err)
return false, err
}
} else {
if ignored {
fmt.Printf("%s %s is ignored by Git.\n", repo.GoPath, file)
return true, nil
}
}
fmt.Printf("%s %s is neither tracked nor ignored by Git.\n", repo.GoPath, file)
// this means, if you make a go.mod file, it'll add it to the repo to be tracked
// so you need to either add it to .gitignore (this is what should happen)
// or accept you want an auto-generated file to put endless garbage in your git repo
// this obviously exposes my opinion on this subject matter
return false, nil
}