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
|
// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
// Use of this source code is governed by the GPL 3.0
package main
import (
"time"
"go.wit.com/lib/config"
"go.wit.com/lib/gui/shell"
"go.wit.com/lib/protobuf/forgepb"
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
)
func doMerge() error {
if argv.All == true {
start := time.Now()
repos, err := doMergeDevel()
dur := time.Since(start)
if err != nil {
badExit(err)
}
log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur))
start = time.Now()
repos, err = doMergeMaster()
dur = time.Since(start)
if err != nil {
badExit(err)
}
log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
okExit("")
}
if argv.Merge.Devel != nil {
start := time.Now()
repos, err := doMergeDevel()
dur := time.Since(start)
if err != nil {
badExit(err)
}
log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur))
okExit("")
}
if argv.Merge.Master != nil {
start := time.Now()
repos, err := doMergeMaster()
dur := time.Since(start)
if err != nil {
badExit(err)
}
log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
okExit("")
}
if argv.Merge.Check != nil {
if err := safeToPublish(); err != nil {
me.sh.BadExit("Merge is not complete. Not safe to Publish.", err)
}
okExit("")
}
if showWorkRepos() {
// found some repos at least
} else {
// every repo is in a really clean state. no extra files anywhere
// no dirty repos, no repos that need to be published
// nothing different between user and master branch version. not common
log.Info("There does't seem to be anything to merge. Your repos are very consistent.")
}
return nil
}
func hashesMatch(repo *gitpb.Repo) error {
uhash := repo.ActualGetUserHash()
dhash := repo.ActualGetDevelHash()
mhashl, mhashr := repo.ActualGetMasterHash()
// log.Info(uhash, dhash, mhashl, mhashr)
if uhash != dhash {
return log.Errorf("user does not match devel")
}
if dhash != mhashl {
return log.Errorf("devel does not match mater")
}
if mhashl != mhashr {
return log.Errorf("local master branch does not match remote branch")
}
return nil
}
func safeToPublish() error {
// always run dirty first
me.forge.CheckDirtyQuiet()
// if no option is given to patch, list out the
// repos that have patches ready in them
found := findReposWithPatches()
if found.Len() == 0 {
log.Info("you currently have no repos with patches")
return log.Errorf("no repos to publish")
}
// check if any are dirty
for repo := range found.IterAll() {
if repo.CheckDirty() {
return log.Errorf("%s repo is dirty", repo.FullPath)
}
}
// check the hashes
for repo := range found.IterAll() {
if err := hashesMatch(repo); err != nil {
log.Info("hash mismatch", repo.FullPath, err)
return err
}
}
// move them all the the master branch
var bad bool
for repo := range found.IterAll() {
if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
repo.CheckoutMaster()
bad = true
}
}
if bad {
return log.Errorf("some repos had to be switched to the master branch")
}
if !argv.Force {
return log.Errorf("notsure. it might be safe to publish(?)")
}
return nil
}
func doMergeReport() *forgepb.Patches {
found := forgepb.NewPatches()
for repo := range me.forge.Repos.IterAll() {
if repo.GetDevelVersion() == repo.GetMasterVersion() {
continue
}
tmp := log.Sprintf("%s..%s", repo.GetMasterVersion(), repo.GetDevelVersion())
r, err := repo.RunStrict([]string{"git", "log", "--pretty=format:%H", tmp})
_ = err
for i, line := range r.Stdout {
log.Info(i, line, repo.FullPath)
}
}
return found
}
func doMergeDevel() (*gitpb.Repos, error) {
var err error
done := gitpb.NewRepos()
found := findMergeToDevel()
for repo := range found.IterAll() {
if _, err := repo.MergeToDevel(); err != nil {
log.Info("merge from user 2 failed", repo.GetGoPath(), err)
// err := log.Errorf("merge from user failed")
// log.Info(strings.Join(r.Stdout, "\n"))
// log.Info(strings.Join(r.Stderr, "\n"))
badExit(err)
}
config.SetChanged("repos", true)
// repoMergeToDevel(repo)
/*
if repo.CheckDirty() {
log.Info("repo is dirty", repo.GetFullPath())
continue
}
log.Infof("%s starting git merge\n", repo.FullPath)
if repo.CheckoutDevel() {
log.Info("checkout devel failed", repo.GetGoPath())
err = log.Errorf("checkout devel failed")
badExit(err)
}
// hash differences when merging user into devel branch
out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName())
for i, hash := range out {
log.Info("MERGE HASHES TO DEVEL:", i, hash)
}
if _, err := repo.MergeToDevel(); err != nil {
log.Info("merge from user 1 failed", repo.GetGoPath(), err)
err = log.Errorf("merge from user 1 failed")
// log.Info(strings.Join(r.Stdout, "\n"))
// log.Info(strings.Join(r.Stderr, "\n"))
badExit(err)
}
done.Append(repo)
config.SetChanged("repos", true)
*/
}
return done, err
}
/*
func repoMergeToDevel(repo *gitpb.Repo) error {
if _, err := repo.MergeToDevel(); err != nil {
log.Info("merge from user 3 failed", repo.GetGoPath(), err)
// err := log.Errorf("merge from user failed")
// log.Info(strings.Join(r.Stdout, "\n"))
// log.Info(strings.Join(r.Stderr, "\n"))
badExit(err)
}
config.SetChanged("repos", true)
return nil
}
*/
func doMergeMaster() (*gitpb.Repos, error) {
var err error
setForgeMode(forgepb.ForgeMode_MASTER)
done := gitpb.NewRepos()
found := findMergeToMaster()
for repo := range found.IterAll() {
if _, err := repo.MergeToMaster(); err != nil {
log.Info("merge from devel 1 failed", repo.GetGoPath(), err)
err = log.Errorf("merge from devel 1 failed")
badExit(err)
}
done.Append(repo)
config.SetChanged("repos", true)
}
return done, err
}
|
