summaryrefslogtreecommitdiff
path: root/patchset.Make.go
blob: 39eb8272f6e028f05d69747e39f5d2804c8f640a (plain)
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
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
package forgepb

import (
	"bytes"
	"errors"
	"fmt"
	"os"
	"os/exec"
	"path/filepath"
	"strings"
	"time"

	"github.com/google/uuid"
	"go.wit.com/lib/hostname"
	"go.wit.com/lib/protobuf/gitpb"
	"go.wit.com/lib/protobuf/httppb"
	"go.wit.com/log"
	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
)

func (p *Patches) HttpPostVerbose(baseURL string, route string) (*Patches, *httppb.HttpRequest, error) {
	p.PrintTable()
	return p.HttpPost(baseURL, route)
}

func (p *Set) HttpPostVerbose(baseURL string, route string) (*Set, *httppb.HttpRequest, error) {
	p.PrintTable()
	return p.HttpPost(baseURL, route)
}

func (p *Sets) HttpPostVerbose(baseURL string, route string) (*Sets, *httppb.HttpRequest, error) {
	p.PrintTable()
	return p.HttpPost(baseURL, route)
}

func newPatchset(name string) *Set {
	pset := new(Set)
	pset.Name = name
	pset.Ctime = timestamppb.New(time.Now())
	pset.Uuid = uuid.New().String()
	pset.Hostname, _ = hostname.Get()
	pset.Patches = NewPatches()

	return pset
}

// creates a patchset
// works from the user branches against the devel branches
func (f *Forge) MakeDevelPatchSet(name string) (*Set, error) {
	pset := newPatchset(name)
	if os.Getenv("GIT_AUTHOR_NAME") == "" {
		return nil, fmt.Errorf("GIT_AUTHOR_NAME not set")
	} else {
		pset.GitAuthorName = os.Getenv("GIT_AUTHOR_NAME")
	}
	if os.Getenv("GIT_AUTHOR_EMAIL") == "" {
		return nil, fmt.Errorf("GIT_AUTHOR_EMAIL not set")
	} else {
		pset.GitAuthorEmail = os.Getenv("GIT_AUTHOR_EMAIL")
	}

	dir, err := os.MkdirTemp("", "forge")
	if err != nil {
		return nil, err
	}
	// defer os.RemoveAll(dir) // clean up
	pset.TmpDir = dir

	all := f.Repos.SortByFullPath()
	for all.Scan() {
		repo := all.Next()

		if !repo.IsLocalBranch(repo.GetUserBranchName()) {
			// log.Info("repo doesn't have user branch", repo.GetGoPath())
			continue
		}
		if !repo.IsLocalBranch(repo.GetDevelBranchName()) {
			// log.Info("repo doesn't have devel branch", repo.GetGoPath())
			continue
		}

		if repo.ActualGetDevelHash() == repo.ActualGetUserHash() {
			continue
		}

		// make a patchset from user to devel
		// TODO: verify branches are otherwise exact
		pset.StartBranchName = repo.GetDevelBranchName()
		pset.EndBranchName = repo.GetUserBranchName()

		err := pset.makePatchSetNew(repo)
		if err != nil {
			return nil, err
		}
	}
	return pset, nil
}

func (pset *Set) makePatchSetNew(repo *gitpb.Repo) error {
	startBranch := pset.StartBranchName
	endBranch := pset.EndBranchName
	repoDir := filepath.Join(pset.TmpDir, repo.GetGoPath())
	err := os.MkdirAll(repoDir, 0755)
	if err != nil {
		return err
	}

	// maybe better? maybe worse?
	// git format-patch -o patches --stdout <commit-range> > my-patch.mbox
	// git format-patch --stdout -5 > my-patch.mbox  # last 5 patches
	// git am < my-patch.mbox
	// git format-patch branch1..branch2
	// export GIT_COMMITTER_DATE="2024-01-01T12:00:00"
	// export GIT_AUTHOR_DATE="2024-01-01T12:00:00"
	// export GIT_COMMITTER_NAME="Your Name"
	// export GIT_COMMITTER_EMAIL="[email protected]"
	// export GIT_AUTHOR_NAME="Your Name"
	// export GIT_AUTHOR_EMAIL="[email protected]"
	// git am < patch.mbox

	cmd := []string{"git", "format-patch", "-o", repoDir, startBranch + ".." + endBranch}
	r := repo.Run(cmd)
	if r.Error != nil {
		log.Info("git format-patch", repo.FullPath)
		log.Info("git format-patch", cmd)
		log.Info("git format-patch error", r.Error)
		return r.Error
	}
	if r.Exit != 0 {
		log.Info("git format-patch", repo.FullPath)
		log.Info("git format-patch", cmd)
		log.Info("git format-patch exit", r.Exit)
		return errors.New(fmt.Sprintf("git returned %d", r.Exit))
	}
	if len(r.Stdout) == 0 {
		log.Infof("No patches in %s (%s,%s)\n", repo.FullPath, repo.ActualGetDevelHash(), repo.ActualGetUserHash())
		// git created no files to add
		return nil
	}

	err = pset.addPatchFiles(repo, repoDir)
	log.Infof("Added %d patches for %s len=%d\n", len(r.Stdout), repo.FullPath, pset.Patches.Len())
	// pset.PrintTable()
	return err
}

// git show <original_commit_hash> | git patch-id
// git cat-file -p <commit_hash> | grep tree
// process each file in pDir/
func (p *Set) addPatchFiles(repo *gitpb.Repo, fullDir string) error {
	var baderr error
	// log.Info("ADD PATCH FILES ADDED DIR", fullDir)
	filepath.Walk(fullDir, func(path string, info os.FileInfo, err error) error {
		if err != nil {
			// Handle possible errors, like permission issues
			fmt.Fprintf(os.Stderr, "error accessing path %q: %v\n", path, err)
			baderr = err
			return err
		}

		if info.IsDir() {
			return nil
		}
		data, err := os.ReadFile(path)
		if err != nil {
			log.Info("addPatchFile() failed", path)
			baderr = err
			return err
		}
		patch := new(Patch)
		patch.Filename, _ = filepath.Rel(p.TmpDir, path)
		patch.Data = data
		if err := patch.parseData(); err != nil {
			log.Info("parseData() failed", err)
			return err
		}
		if err := findPatchId(repo, patch); err != nil {
			log.Info("findPatchId() failed", err)
			return err
		}
		patch.StartHash = repo.ActualDevelHash()
		patch.NewHash = "na"
		patch.Namespace = repo.GetGoPath()
		if p.Patches == nil {
			log.Info("SHOULD NOT HAVE HAPPENED. p.Patches == nil")
			p.Patches = new(Patches)
		}
		p.Patches.Append(patch)
		// log.Info("ADDED PATCH FILE", path)
		return nil
	})
	return baderr
}

// looks at the git format-patch output
// saves the commit Hash
// saves the diff lines
func (p *Patch) parseData() error {
	lines := strings.Split(string(p.Data), "\n")
	for _, line := range lines {
		fields := strings.Fields(line)
		if len(fields) < 2 {
			continue
		}
		switch fields[0] {
		case "From":
			p.CommitHash = fields[1]
		case "Subject:":
			p.Comment = line
		case "diff":
			p.Files = append(p.Files, line)
		}
	}
	return nil
}

// just an example of how to walk only directories
func onlyWalkDirs(pDir string) error {
	log.Info("DIR", pDir)
	// var all []string
	var baderr error
	filepath.WalkDir(pDir, func(path string, d os.DirEntry, err error) error {
		if err != nil {
			// Handle possible errors, like permission issues
			fmt.Fprintf(os.Stderr, "error accessing path %q: %v\n", path, err)
			baderr = err
			return err
		}

		log.Info("TESTING DIR", path)
		if d.IsDir() {
			return filepath.SkipDir
		}
		log.Info("NEVER GETS HERE? WHAT IS THIS?", path)
		return nil
	})
	return baderr
}

// func runPipe() error {
func findPatchId(repo *gitpb.Repo, p *Patch) error {
	if p.CommitHash == "" {
		return log.Errorf("%s commit hash not found", p.Filename)
	}

	// 1. Create the command to get the diff for the commit.
	//    "git show" is the perfect tool for this.
	cmdShow := exec.Command("git", "show", p.CommitHash)
	cmdShow.Dir = repo.GetFullPath()

	// 2. Create the command to calculate the patch-id from stdin.
	cmdPipeID := exec.Command("git", "patch-id", "--stable")
	cmdPipeID.Dir = repo.GetFullPath()

	// 3. Connect the output of "git show" to the input of "git patch-id".
	//    This is the Go equivalent of the shell pipe `|`.
	pipe, err := cmdShow.StdoutPipe()
	if err != nil {
		return fmt.Errorf("failed to create pipe: %w", err)
	}
	cmdPipeID.Stdin = pipe

	// 4. We need a buffer to capture the final output from git patch-id.
	var output bytes.Buffer
	cmdPipeID.Stdout = &output

	// 5. Start the reading command (patch-id) first.
	if err := cmdPipeID.Start(); err != nil {
		return fmt.Errorf("failed to start git-patch-id: %w", err)
	}

	// 6. Run the writing command (show). This will block until it's done.
	if err := cmdShow.Run(); err != nil {
		return fmt.Errorf("failed to run git-show: %w", err)
	}

	// 7. Wait for the reading command to finish.
	if err := cmdPipeID.Wait(); err != nil {
		return fmt.Errorf("failed to wait for git-patch-id: %w", err)
	}

	fields := strings.Fields(output.String())
	if len(fields) != 2 {
		return fmt.Errorf("git-patch-id produced empty output")
	}

	if fields[1] != p.CommitHash {
		return fmt.Errorf("patchid did not match %s != %v", p.CommitHash, fields)
	}

	// log.Infof("hash=%s patchid(%v) %s\n", p.CommitHash, fields, p.Filename)
	p.PatchId = fields[0]
	return nil
}