rm old code

This commit is contained in:
Jeff Carr 2025-02-22 04:54:06 -06:00
parent 6eb37f63f2
commit 3d58bc1c32
4 changed files with 0 additions and 142 deletions

View File

@ -47,16 +47,9 @@ type CleanCmd struct {
GitReset *EmptyCmd `arg:"subcommand:git-reset" help:"git reset --hard"`
Pub *EmptyCmd `arg:"subcommand:pub" help:"clean target version numbers"`
User *EmptyCmd `arg:"subcommand:user" help:"clean the user branches"`
Verify *VerifyCmd `arg:"subcommand:verify" help:"verify branches"`
Repo string `arg:"--repo" help:"which repo to look at"`
}
type VerifyCmd struct {
User *FindCmd `arg:"subcommand:user" help:"verify the user branches"`
Devel *FindCmd `arg:"subcommand:devel" help:"verify the devel branches"`
Master *FindCmd `arg:"subcommand:master" help:"verify the master branches"`
}
type CleanDevelCmd struct {
Force bool `arg:"--force" help:"try to strong arm things"`
}

View File

@ -1,93 +0,0 @@
// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
// Use of this source code is governed by the GPL 3.0
package main
import (
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
)
func doVerifyDevel() error {
me.found = new(gitpb.Repos)
all := me.forge.Repos.SortByFullPath()
for all.Scan() {
repo := all.Next()
if repo.IsDirty() {
log.Info(repo.GetGoPath(), "is dirty")
continue
}
if repo.GetDevelBranchName() == "" {
continue
}
if repo.GetMasterBranchName() != repo.GetCurrentBranchName() {
log.Info(repo.GetGoPath(), "is not on master branch")
continue
}
devel := repo.GetDevelBranchName()
if argv.Verbose {
log.Printf("Start clean devel branch: %s %s\n", repo.GetGoPath(), devel)
}
/*
// check if devel branch exists in remote repo
if repo.IsBranchRemote(devel) {
if err := doCleanDevelRepo(repo); err != nil {
log.Info(repo.GetGoPath(), "verify clean failed")
}
// can not continue
continue
}
*/
// devel branch is only local
/*
todo: something?
devname := repo.GetDevelBranchName()
if err := requiresGitPush(repo, devname); err != nil {
log.Info(repo.GetGoPath(), "is out of sync with upstream")
return err
}
*/
}
return nil
}
/*
err = fmt.Errorf("examineBranch() branch differs. patch diff len == 0. PROBABLY DELETE BRANCH %s", repo.CurrentTag.Refname)
log.Info(err)
cmd := repo.ConstructGitDiffLog(repo.CurrentTag.Refname, repo.GetMasterBranchName())
if argv.Clean.Examine.Fix == nil {
log.Info(repo.GetGoPath(), cmd)
} else {
if _, err := repo.RunVerbose(cmd); err != nil {
return err
}
}
cmd = repo.ConstructGitDiffLog(repo.GetMasterBranchName(), repo.CurrentTag.Refname)
if argv.Clean.Examine.Fix == nil {
log.Info(repo.GetGoPath(), cmd)
} else {
if _, err := repo.RunVerbose(cmd); err != nil {
return err
}
}
cmd = []string{"git", "branch", "-D", repo.CurrentTag.Refname}
log.Info(repo.GetGoPath(), "TRY THIS:", cmd)
if argv.Clean.Examine.Fix == nil {
log.Info(repo.GetGoPath(), "TODO: CHECK REMOTE BRANCH DOES NOT EXIST", repo.CurrentTag.Refname)
repo.RunVerbose([]string{"ls", "-l", ".git/refs/remotes/origin"})
} else {
log.Info(repo.GetGoPath(), "TODO: CHECK REMOTE BRANCH DOES NOT EXIST", repo.CurrentTag.Refname)
if _, err := repo.RunVerbose(cmd); err != nil {
return err
} else {
return nil
}
}
return err
}
err = fmt.Errorf("examineBranch() branch differs, but not sure how to fix it yet == %d", len(dcount))
log.Info(err)
return nil
*/

View File

@ -1,37 +0,0 @@
// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
// Use of this source code is governed by the GPL 3.0
package main
/*
func doVerifyUser() error {
me.found = new(gitpb.Repos)
all := me.forge.Repos.SortByFullPath()
for all.Scan() {
repo := all.Next()
if repo.IsDirty() {
log.Info(repo.GetGoPath(), "is dirty")
me.found.AppendByGoPath(repo)
continue
}
if repo.ExistsUserBranchRemote() {
}
if repo.ExistsUserBranch() {
}
if repo.GetMasterBranchName() == repo.GetCurrentBranchName() {
log.Info(repo.GetGoPath(), "is not on master branch")
continue
}
devel := repo.GetDevelBranchName()
if argv.Verbose {
log.Printf("Start clean devel branch: %s %s\n", repo.GetGoPath(), devel)
}
}
return nil
}
func verifyRemoteUserBranch(repo *gitpb.Repo) {
}
*/

View File

@ -111,11 +111,6 @@ func main() {
okExit("reset")
}
if argv.Clean.Verify != nil {
doVerifyDevel()
okExit("verify")
}
if err := doClean(); err != nil {
badExit(err)
}