summaryrefslogtreecommitdiff
path: root/doClean.go
diff options
context:
space:
mode:
Diffstat (limited to 'doClean.go')
-rw-r--r--doClean.go154
1 files changed, 136 insertions, 18 deletions
diff --git a/doClean.go b/doClean.go
index 154be88..acc510a 100644
--- a/doClean.go
+++ b/doClean.go
@@ -22,13 +22,14 @@ func doClean() error {
repo := all.Next()
if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
// skip this while in devel
- // continue
+ continue
}
if repo.IsDirty() {
continue
}
if err := doCleanRepo(repo); err != nil {
- badRepoExit(repo, err)
+ log.Info(repo.GetGoPath(), err)
+ okExit("")
}
}
log.Info("All repos on the master branch are clean")
@@ -61,21 +62,25 @@ func doCleanRepo(repo *gitpb.Repo) error {
if name == repo.GetUserBranchName() {
hasLocal = true
if err := doCleanUserBranch(repo, b); err != nil {
- log.Info("\tLOCAL BRANCH ERROR user")
+ log.Info("\tLOCAL BRANCH ERROR user =", name)
return err
}
- log.Info("\tLOCAL BRANCH user")
+ log.Info("\tLOCAL BRANCH user =", name)
continue
}
if name == repo.GetDevelBranchName() {
- if err := doCleanDevelBranch(repo, b); err != nil {
- log.Info("\tLOCAL BRANCH ERROR devel")
- return err
- }
- log.Info("\tLOCAL BRANCH devel")
+ /*
+ if err := doCleanDevelBranch(repo, b); err != nil {
+ log.Info("\tLOCAL BRANCH ERROR devel")
+ return err
+ }
+ log.Info("\tLOCAL BRANCH devel")
+ */
continue
}
- log.Info("\tlocal branch name unknown:", name, b.Merge, b.Remote)
+ if err := verifyLocalBranchIsMerged(repo, b); err != nil {
+ return err
+ }
}
if argv.Clean.Force == nil {
if hasLocal {
@@ -86,7 +91,49 @@ func doCleanRepo(repo *gitpb.Repo) error {
}
func verifyLocalBranchIsMerged(repo *gitpb.Repo, branch *gitpb.GitBranch) error {
- return nil
+ base := filepath.Base(branch.Name)
+ log.Info("local branch name unknown:", base, branch.Name, branch.Merge, branch.Remote, repo.GetGoPath())
+
+ // check if it exists in the origin
+ if repo.Exists(filepath.Join(".git/refs/remotes/origin", base)) {
+ err := fmt.Errorf("repo %s ERROR. branch is also remote %s", repo.GetGoPath(), branch.Name)
+ log.Info(err)
+ if err := isSafeToDelete(repo, base); err != nil {
+ log.Info(err)
+ return err
+ }
+ if err := requiresGitPush(repo, base); err != nil {
+ log.Info(err)
+ return err
+ }
+ err = fmt.Errorf("repo %s BRANCH AND REMOTE CAN BE DELETED %s", repo.GetGoPath(), branch.Name)
+ log.Info(err)
+ if argv.Clean.Force != nil {
+ err = forceDeleteBranch(repo, base)
+ repo.Reload()
+ }
+ return err
+ }
+
+ if !repo.Exists(filepath.Join(".git/refs/heads", base)) {
+ log.Info("GitConfig() parse logic error. not really a local branch", base)
+ me.forge.Repos.Delete(repo)
+ configSave = true
+ return nil
+ }
+
+ // this is only a local branch
+ if err := isSafeToDelete(repo, base); err != nil {
+ log.Info(err)
+ return err
+ }
+ err := fmt.Errorf("repo %s BRANCH CAN PROBABLY BE DELETED base=%s fullname=%s", repo.GetGoPath(), base, branch.Name)
+ log.Info(err)
+ if argv.Clean.Force != nil {
+ err = forceDeleteBranch(repo, base)
+ repo.Reload()
+ }
+ return err
}
func doCleanDevelBranch(repo *gitpb.Repo, branch *gitpb.GitBranch) error {
@@ -135,10 +182,11 @@ func doCleanUserBranch(repo *gitpb.Repo, branch *gitpb.GitBranch) error {
}
log.Info("THIS USER BRANCH IS CLEAN TO DELETE", branch.Name)
if argv.Clean.Force != nil {
- cmd := []string{"git", "branch", "-D", branch.Name}
- _, err := repo.RunVerbose(cmd)
- log.Info(err)
- return err
+ err := forceDeleteBranch(repo, branch.Name)
+ repo.Reload()
+ if err != nil {
+ return err
+ }
}
} else {
log.Info("why is this local only branch a problem?", branch.Name)
@@ -157,9 +205,11 @@ func doCleanUserBranch(repo *gitpb.Repo, branch *gitpb.GitBranch) error {
log.Info("THIS USER BRANCH IS CLEAN TO DELETE", branch.Name)
if argv.Clean.Force != nil {
cmd := []string{"git", "branch", "-D", branch.Name}
- _, err := repo.RunVerbose(cmd)
- log.Info("THE GIT BRANCH DELETE ERROR IS:", err)
- return err
+ if _, err := repo.RunVerbose(cmd); err != nil {
+ log.Info("THE GIT BRANCH DELETE ERROR IS:", err)
+ return err
+ }
+ return nil
}
}
// return fmt.Errorf("%s repo.CurrentTag is not local: %s. Don't proceed yet", repo.GetGoPath(), repo.CurrentTag.Refname)
@@ -189,3 +239,71 @@ func userToDevelRequiresGitPush(repo *gitpb.Repo, branchName string) error {
}
return fmt.Errorf("user branch not clean to delete. maybe it is? devel might be ahead of user branch. %d %d", missing, b2)
}
+
+// checks against upstream master
+func isSafeToDelete(repo *gitpb.Repo, old string) error {
+ var head string
+ head = filepath.Join("origin", repo.GetMasterBranchName())
+
+ if !repo.Exists(filepath.Join(".git/refs/remotes/", head)) {
+ head = filepath.Join("origin", "HEAD")
+ }
+
+ b1 := countDiffObjects(repo, old, head)
+ b2 := countDiffObjects(repo, head, old)
+ log.Info(old, "vs origin count", b1, b2)
+ if b1 == 0 && b2 == 0 {
+ log.Info("isSafeToDelete() SAFE TO DELETE ==", old, b1, head, b2)
+ return nil
+ }
+ if b1 == 0 {
+ log.Info("isSafeToDelete() SAFE TO DELETE ==", old, b1, head, b2)
+ return nil
+ }
+ if b1 != 0 {
+ log.Info(old, "vs", head, " count b1 != 0, b2 ==", b2, "b1 =", b1)
+ log.Info("THIS MEANS THE LOCAL BRANCH NEEDS GIT PUSH TO ORIGIN BRANCH ==", b1)
+ cmd := repo.ConstructGitDiffLog(old, head)
+ log.Info("cmd", cmd)
+ cmd = repo.ConstructGitDiffLog(head, old)
+ log.Info("cmd", cmd)
+ if argv.Clean.Force != nil {
+ // return gitPushStrict(repo, branchName)
+ }
+ return fmt.Errorf("user branch not clean to delete. needs git push %d %d", b1, b2)
+ }
+ return fmt.Errorf("user branch not clean to delete. needs git push %d %d", b1, b2)
+}
+
+// literally ignore all errors. delete everthing with no checks for now
+func forceDeleteBranch(repo *gitpb.Repo, branch string) error {
+ if repo.IsDirty() {
+ log.Info(repo.GetGoPath(), "is dirty")
+ return nil
+ }
+ if repo.GetUserBranchName() != branch {
+ log.Info(repo.GetGoPath(), branch, "is not the user branch", repo.GetUserBranchName())
+ return nil
+ }
+ configSave = true
+
+ cmd := []string{"git", "branch", "-D", branch}
+ if _, err := repo.RunVerbose(cmd); err != nil {
+ log.Info("THE GIT BRANCH DELETE ERROR IS:", err)
+ // return err
+ }
+ log.Info("THIS USER REMOTE BRANCH MUST BE DELETED HERE", branch)
+ // git push origin --delete jcarr
+ cmd = []string{"git", "push", "origin", "--delete", branch}
+ if _, err := repo.RunVerbose(cmd); err != nil {
+ log.Info("THE GIT BRANCH DELETE ERROR IS:", err)
+ // return err
+ }
+ cmd = []string{"git", "branch", "-D", "--remote", "origin/" + branch}
+ if _, err := repo.RunVerbose(cmd); err != nil {
+ log.Info("THE GIT BRANCH DELETE ERROR IS:", err)
+ // return err
+ }
+ // return fmt.Errorf("one at a time %s", repo.GetGoPath())
+ return nil
+}
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-05 14:37:48 +0000