git-workflow/autogits
SHA256
20
0
Fork 9
Code Issues 44 Pull Requests 5 Projects 2 Activity

pr: use correct prjgit repo name

Browse Source
This commit is contained in:
Adam Majer
2025-05-06 23:59:51 +02:00
parent aeb4c20744
commit cb64635aea
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/git_utils.go
View File

@@ -627,7 +627,7 @@ func (e *GitHandlerImpl) GitParseCommits(cwd string, commitIDs []string) (parsed
var done sync.Mutex
done.Lock()
data_in, data_out := ChanIO{make(chan byte, 256)}, ChanIO{make(chan byte, 70)}
data_in, data_out := ChanIO{make(chan byte)}, ChanIO{make(chan byte)}
parsedCommits = make([]GitCommit, 0, len(commitIDs))
go func() {
@@ -661,7 +661,12 @@ func (e *GitHandlerImpl) GitParseCommits(cwd string, commitIDs []string) (parsed
return len(data), nil
})
LogDebug("command run:", cmd.Args)
err = cmd.Run()
if e := cmd.Run(); e != nil {
LogError(e)
close(data_in.ch)
close(data_out.ch)
return nil, e
}
done.Lock()
return
@@ -672,7 +677,7 @@ func (e *GitHandlerImpl) GitCatFile(cwd, commitId, filename string) (data []byte
var done sync.Mutex
done.Lock()
data_in, data_out := ChanIO{make(chan byte, 256)}, ChanIO{make(chan byte, 70)}
data_in, data_out := ChanIO{make(chan byte)}, ChanIO{make(chan byte)}
go func() {
defer done.Unlock()
@@ -726,6 +731,7 @@ func (e *GitHandlerImpl) GitCatFile(cwd, commitId, filename string) (data []byte
})
LogDebug("command run:", cmd.Args)
if e := cmd.Run(); e != nil {
LogError(e)
close(data_in.ch)
close(data_out.ch)
return nil, e
@@ -740,7 +746,7 @@ func (e *GitHandlerImpl) GitSubmoduleList(gitPath, commitId string) (submoduleLi
submoduleList = make(map[string]string)
done.Lock()
data_in, data_out := ChanIO{make(chan byte, 256)}, ChanIO{make(chan byte, 70)}
data_in, data_out := ChanIO{make(chan byte)}, ChanIO{make(chan byte)}
go func() {
defer done.Unlock()
@@ -798,14 +804,19 @@ func (e *GitHandlerImpl) GitSubmoduleList(gitPath, commitId string) (submoduleLi
return len(data), nil
})
LogDebug("command run:", cmd.Args)
err = cmd.Run()
if e := cmd.Run(); e != nil {
LogError(e)
close(data_in.ch)
close(data_out.ch)
return submoduleList, e
}
done.Lock()
return submoduleList, err
}
func (e *GitHandlerImpl) GitSubmoduleCommitId(cwd, packageName, commitId string) (subCommitId string, valid bool) {
data_in, data_out := ChanIO{make(chan byte, 256)}, ChanIO{make(chan byte, 70)}
data_in, data_out := ChanIO{make(chan byte)}, ChanIO{make(chan byte)}
var wg sync.WaitGroup
wg.Add(1)
@@ -861,8 +872,11 @@ func (e *GitHandlerImpl) GitSubmoduleCommitId(cwd, packageName, commitId string)
return len(data), nil
})
LogDebug("command run:", cmd.Args)
if err := cmd.Run(); err != nil {
LogError("Error running command:", cmd.Args, err)
if e := cmd.Run(); e != nil {
LogError(e)
close(data_in.ch)
close(data_out.ch)
return subCommitId, false
}
wg.Wait()

1
workflow-pr/pr_processor.go
View File

@@ -59,6 +59,7 @@ func (w *RequestProcessor) ProcessFunc(request *common.Request) error {
if err != nil {
return fmt.Errorf("Error allocating GitHandler. Err: %w", err)
}
common.LogDebug("git path:", git.GetPath())
defer git.Close()
switch req.Action {

9
workflow-pr/repo_check.go
View File

@@ -81,6 +81,7 @@ func (s *DefaultStateChecker) VerifyProjectState(config *common.AutogitConfig) e
common.LogInfo(" checking", prjGitOrg+"/"+prjGitRepo+"#"+prjGitBranch)
git, err := GitHandler.CreateGitHandler(config.Organization)
common.LogDebug("Git Path:", git.GetPath())
if err != nil {
return fmt.Errorf("Cannot create git handler: %w", err)
}
@@ -91,7 +92,7 @@ func (s *DefaultStateChecker) VerifyProjectState(config *common.AutogitConfig) e
return fmt.Errorf("Error fetching or creating '%s/%s#%s' -- aborting verifyProjectState(). Err: %w", prjGitBranch, prjGitRepo, prjGitBranch, err)
}
_, err = git.GitClone(config.GitProjectName, prjGitBranch, repo.SSHURL)
_, err = git.GitClone(prjGitRepo, prjGitBranch, repo.SSHURL)
common.PanicOnError(err)
prs, err := Gitea.GetRecentPullRequests(prjGitOrg, prjGitRepo, prjGitBranch)
if err != nil {
@@ -103,7 +104,7 @@ func (s *DefaultStateChecker) VerifyProjectState(config *common.AutogitConfig) e
}
common.LogDebug(" - # of PRs to check in PrjGit:", len(prs))
submodules, err := git.GitSubmoduleList(config.GitProjectName, "HEAD")
submodules, err := git.GitSubmoduleList(prjGitRepo, "HEAD")
nextSubmodule:
for sub, commitID := range submodules {
@@ -150,8 +151,8 @@ nextSubmodule:
}
// not found in past, check if we should advance the branch label ... pull the submodule
git.GitExecOrPanic(config.GitProjectName, "submodule", "update", "--init", "--filter", "blob:none", "--", sub)
subDir := path.Join(config.GitProjectName, sub)
git.GitExecOrPanic(prjGitRepo, "submodule", "update", "--init", "--filter", "blob:none", "--", sub)
subDir := path.Join(prjGitRepo, sub)
newCommits := common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(subDir, "rev-list", "^origin/"+branch, commitID), "\n")
if len(newCommits) >= 1 {