jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try to report old patches

This commit is contained in:
Jeff Carr 2025-09-04 22:37:55 -05:00
parent 5dbfed7a31
commit e09849b1a2
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doPatch.go
View File

@ -37,6 +37,7 @@ func doPatch() error {
for p := range old.IterAll() { for p := range old.IterAll() {
log.Info("patch", p.Filename, p.Namespace) log.Info("patch", p.Filename, p.Namespace)
} }
me.forge.SubmitPatchesNew(old, "oldpatchset")
return nil return nil
} }

22
helperPatches.go
View File

@ -266,20 +266,22 @@ func findExpired() *forgepb.Patches {
continue continue
} }
os.Chdir(repo.GetFullPath()) os.Chdir(repo.GetFullPath())
newhash, err := findCommitByHash(patch.StartHash, comment) _, err := findCommitByHash(patch.StartHash, comment)
if err != nil {
// this patch has not been applied yet
log.Info("patch: not found hash:", patch.Namespace, patch.CommitHash, comment, err)
continue
}
newhash, err = findCommitBySubject(comment)
if err == nil { if err == nil {
patch.NewHash = newhash log.Info("found applied patch", patch.Namespace, ": newhash:", patch.NewHash, "commithash:", patch.CommitHash, comment)
log.Info("patch: found hash:", patch.Namespace, "commit patch", patch.CommitHash, "new hash", newhash, "start hash", patch.StartHash, comment)
found.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice found.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
continue continue
} }
/*
newhash, err = findCommitBySubject(comment)
if err == nil {
patch.NewHash = newhash
log.Info("patch: found hash:", patch.Namespace, "commit patch", patch.CommitHash, "new hash", newhash, "start hash", patch.StartHash, comment)
found.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
continue
}
*/
} }
return found return found