1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
|
package main
import (
"fmt"
"path/filepath"
"slices"
"strings"
"time"
"go.wit.com/lib/gui/shell"
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
)
func doExamine() bool {
me.found = new(gitpb.Repos)
all := me.forge.Repos.SortByFullPath()
for all.Scan() {
repo := all.Next()
if tag := repo.ExamineBranches(); tag != nil {
me.found.AppendByGoPath(repo)
// ctime := tag.Creatordate.AsTime()
// dur := time.Since(ctime)
// log.Printf("UNKNOWN BRANCH %-50s %s %4s %s\n", repo.GetFullPath(), tag.Hash, shell.FormatDuration(dur), tag.Refname)
repo.CurrentTag = tag
} else {
repo.CurrentTag = nil
}
}
if len(me.found.Repos) == 0 {
return true
}
// slices.Reverse(me.found.Repos)
slices.SortFunc(me.found.Repos, func(a, b *gitpb.Repo) int {
atime := a.CurrentTag.Creatordate.AsTime()
btime := b.CurrentTag.Creatordate.AsTime()
if atime.Before(btime) {
// log.Info("atime vs btime is 0", atime, btime)
return 1
}
// log.Info("atime vs btime is 1", atime, btime)
return -1
})
all = me.found.All()
me.found = new(gitpb.Repos)
for all.Scan() {
repo := all.Next()
if isNormal(repo) {
continue
}
tag := repo.CurrentTag
ctime := tag.Creatordate.AsTime()
dur := time.Since(ctime)
log.Printf("UNKNOWN BRANCH %-50s %s %4s %s\n", repo.GetFullPath(), tag.Hash, shell.FormatDuration(dur), tag.Refname)
err := examineBranch(repo)
if argv.Examine.Fix != nil {
if err != nil {
badExit(err)
}
}
me.found.AppendByGoPath(repo)
}
me.forge.PrintHumanTableDirty(me.found)
return false
}
func isNormal(repo *gitpb.Repo) bool {
if repo.IsDirty() {
return true
}
if repo.GetUserVersion() != repo.GetDevelVersion() {
return true
}
return false
}
func examineBranch(repo *gitpb.Repo) error {
if !isLocal(repo) {
base := filepath.Base(repo.CurrentTag.Refname)
if base == repo.GetUserBranchName() {
log.Info("The user branch also has a remote branch", repo.CurrentTag.Refname)
log.Info("TODO: verify the remote branch is out of date", repo.CurrentTag.Refname)
log.Info("TODO: delete the remote branch", repo.CurrentTag.Refname)
return nil
}
if repo.Exists(filepath.Join(".git/refs/heads", base)) {
repo.RunVerbose([]string{"ls", "-l", ".git/refs/remotes/origin"})
repo.RunVerbose([]string{"cat", filepath.Join(".git/refs/remotes/origin", base)})
repo.RunVerbose([]string{"cat", filepath.Join(".git/refs/heads", base)})
log.Info("why is this local branch a problem?", repo.CurrentTag.Refname)
} else {
repo.RunVerbose([]string{"ls", "-l", ".git/refs/remotes/origin"})
log.Info("why is this non-local branch a problem?", repo.CurrentTag.Refname)
r, err := repo.RunVerbose([]string{"cat", filepath.Join(".git/refs/remotes/origin", base)})
if err == nil {
cmd := []string{"git", "show", "-s", "--format=\"%H %ae %as %s\"", r.Stdout[0]}
repo.RunVerbose(cmd)
log.Info(cmd)
return nil
}
}
return fmt.Errorf("%s repo.CurrentTag is not local: %s. Don't proceed yet", repo.GetGoPath(), repo.CurrentTag.Refname)
}
dcount, err := showNotMaster(repo)
if err != nil {
return err
}
if repo.CurrentTag == nil {
return fmt.Errorf("repo.CurrentTag == nil")
}
if repo.CurrentTag.Refname == "jcarr" {
return requiresGitPush(repo, "jcarr")
}
if repo.CurrentTag.Refname == "origin/jcarr" {
return requiresGitPush(repo, "jcarr")
}
if len(dcount) == 0 {
if repo.CurrentTag.Refname == repo.GetMasterBranchName() {
err = fmt.Errorf("examineBranch() SPECIAL CASE. %s is the master branch", repo.CurrentTag.Refname)
log.Info(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.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.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.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
}
func checkJcarr(repo *gitpb.Repo) int {
b1 := countDiffObjects(repo, "jcarr", "origin/jcarr")
b2 := countDiffObjects(repo, "origin/jcarr", "jcarr")
log.Info("jcarr vs origin count", b1, b2)
if b1 == 0 && b2 == 0 {
return 0
}
if b1 != 0 {
log.Info("jcarr vs origin count b1 != 0, b2 ==", b1, b2)
log.Info("THIS MEANS THE LOCAL BRANCH NEEDS GIT PUSH TO ORIGIN BRANCH ==", b1, b2)
return b1
}
if b2 != 0 {
log.Info("jcarr vs origin count b2 != 0, b1 ==", b2, b1)
return b2
}
return -1
}
func isLocal(repo *gitpb.Repo) bool {
base, name := filepath.Split(repo.CurrentTag.Refname)
if name == "" {
return false
}
if base == "" {
return true
}
return false
}
func showNotMaster(repo *gitpb.Repo) ([]string, error) {
var cmd []string
cmd = append(cmd, "git")
cmd = append(cmd, "log")
cmd = append(cmd, "--format=\"%H\"")
cmd = append(cmd, repo.CurrentTag.Hash)
cmd = append(cmd, "--not")
cmd = append(cmd, repo.GetMasterBranchName())
r, err := repo.RunVerboseOnError(cmd)
return r.Stdout, err
}
func showNotDevel(repo *gitpb.Repo) ([]string, error) {
var cmd []string
cmd = append(cmd, "git")
cmd = append(cmd, "log")
cmd = append(cmd, "--format=\"%H\"")
cmd = append(cmd, repo.CurrentTag.Hash)
cmd = append(cmd, "--not")
cmd = append(cmd, "devel")
r, err := repo.RunVerboseOnError(cmd)
return r.Stdout, err
}
// count all objects only in branch1
func countDiffObjects(repo *gitpb.Repo, branch1, branch2 string) int {
cmd := repo.ConstructGitDiffLog(branch1, branch2)
r, err := repo.RunVerboseOnError(cmd)
if err != nil {
return -1
}
log.Info("countDiffObjects()", cmd, len(r.Stdout), strings.Join(r.Stdout, " "))
return len(r.Stdout)
}
/*
func constructGitDiffLog(repo *gitpb.Repo, branch1, branch2 string) []string {
var cmd []string
cmd = append(cmd, "git")
cmd = append(cmd, "log")
cmd = append(cmd, "--format=\"%H\"")
cmd = append(cmd, branch1)
cmd = append(cmd, "--not")
cmd = append(cmd, branch2)
return cmd
}
*/
// count all objects only in branch1
func gitPushStrict(repo *gitpb.Repo, branchName string) error {
var cmd []string
cmd = append(cmd, "git")
cmd = append(cmd, "push")
_, err := repo.RunVerbose(cmd)
if err != nil {
cmd = []string{"git", "whatchanged", repo.CurrentTag.Hash, "-1"}
repo.RunVerbose(cmd)
}
return err
}
func requiresGitPush(repo *gitpb.Repo, branchName string) error {
b1 := countDiffObjects(repo, branchName, "origin/"+branchName)
b2 := countDiffObjects(repo, "origin/"+branchName, branchName)
log.Info("jcarr vs origin count", b1, b2)
if b1 == 0 && b2 == 0 {
return nil
}
if b1 != 0 {
log.Info("jcarr vs origin count b1 != 0, b2 ==", b1, b2)
log.Info("THIS MEANS THE LOCAL BRANCH NEEDS GIT PUSH TO ORIGIN BRANCH ==", b1)
if argv.Examine.Fix != nil {
return gitPushStrict(repo, branchName)
}
return nil
}
return nil
}
|