git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 43 Pull Requests 6 Projects 2 Activity

.

Browse Source
This commit is contained in:
Adam Majer
2024-08-24 13:32:39 +02:00
parent 6ec271132d
commit 3052a5da5d
16 changed files with 197 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bots-common/git_utils.go
View File

@@ -126,13 +126,13 @@ func (e *RequestHandler) GitBranchHead(gitDir, branchName string) (string, error
path, err := findGitDir(path.Join(e.GitPath, gitDir))
if err != nil {
e.LogError("Error identifying gitdir in `%s`: %#v", gitDir, err)
e.ErrLogger.Printf("Error identifying gitdir in `%s`: %v\n", gitDir, err)
e.Error = err
}
refs, err := processRefs(path)
if err != nil {
e.LogError("Error finding branches (%s): %#v", branchName, err)
e.ErrLogger.Printf("Error finding branches (%s): %v\n", branchName, err)
e.Error = err
return "", e.Error
}
@@ -144,7 +144,7 @@ func (e *RequestHandler) GitBranchHead(gitDir, branchName string) (string, error
}
e.Error = fmt.Errorf("Can't find default remote branch: %s", branchName)
e.LogError("%s", e.Error.Error())
e.ErrLogger.Println(e.Error.Error())
return "", e.Error
}
@@ -201,16 +201,16 @@ func (e *RequestHandler) GitExec(cwd string, params ...string) ExecStream {
}
cmd.Dir = filepath.Join(e.GitPath, cwd)
cmd.Stdout = writeFunc(func(data []byte) (int, error) {
e.Logger.Log("%s", data)
e.StdLogger.Println(data)
return len(data), nil
})
cmd.Stderr = writeFunc(func(data []byte) (int, error) {
e.Logger.LogError("%s", data)
e.ErrLogger.Println(data)
return len(data), nil
})
cmd.Stdin = nil
e.Log("git execute: %#v", cmd.Args)
e.StdLogger.Printf("git execute: %#v\n", cmd.Args)
e.Error = cmd.Run()
return e
@@ -508,7 +508,7 @@ func (e *RequestHandler) GitCatFile(cwd, commitId, filename string) []byte {
c, err := parseGitCommit(data_in.ch)
if err != nil {
e.Error = err
e.LogError("Error parsing git commit: %v", err)
e.ErrLogger.Printf("Error parsing git commit: %v\n", err)
return
}
data_out.Write([]byte(c.Tree))
@@ -517,7 +517,7 @@ func (e *RequestHandler) GitCatFile(cwd, commitId, filename string) []byte {
if err != nil {
e.Error = err
e.LogError("Error parsing git tree: %v", err)
e.ErrLogger.Printf("Error parsing git tree: %v\n", err)
return
}
@@ -528,14 +528,14 @@ func (e *RequestHandler) GitCatFile(cwd, commitId, filename string) []byte {
data, err = parseGitBlob(data_in.ch)
if err != nil {
e.Error = err
e.LogError("Error reading blob data: %v", err)
e.ErrLogger.Printf("Error reading blob data: %v\n", err)
}
return
}
}
e.Error = fmt.Errorf("file not found: '%s'", filename)
e.LogPlainError(e.Error)
e.ErrLogger.Println(e.Error.Error())
}()
cmd := exec.Command("/usr/bin/git", "cat-file", "--batch", "-Z")
@@ -547,10 +547,10 @@ func (e *RequestHandler) GitCatFile(cwd, commitId, filename string) []byte {
cmd.Stdout = &data_in
cmd.Stdin = &data_out
cmd.Stderr = writeFunc(func(data []byte) (int, error) {
e.Logger.LogError("%s", data)
e.ErrLogger.Println(data)
return len(data), nil
})
e.Log("command run: %v", cmd.Args)
e.StdLogger.Printf("command run: %v\n", cmd.Args)
e.Error = cmd.Run()
done.Lock()
@@ -577,7 +577,7 @@ func (e *RequestHandler) GitSubmoduleList(cwd, commitId string) map[string]strin
c, err := parseGitCommit(data_in.ch)
if err != nil {
e.Error = err
e.LogError("Error parsing git commit: %v", err)
e.ErrLogger.Printf("Error parsing git commit: %v\n", err)
return
}
data_out.Write([]byte(c.Tree))
@@ -586,7 +586,7 @@ func (e *RequestHandler) GitSubmoduleList(cwd, commitId string) map[string]strin
if err != nil {
e.Error = err
e.LogError("Error parsing git tree: %v", err)
e.ErrLogger.Printf("Error parsing git tree: %v\n", err)
return
}
@@ -606,10 +606,10 @@ func (e *RequestHandler) GitSubmoduleList(cwd, commitId string) map[string]strin
cmd.Stdout = &data_in
cmd.Stdin = &data_out
cmd.Stderr = writeFunc(func(data []byte) (int, error) {
e.Logger.LogError("%s", data)
e.ErrLogger.Println(data)
return len(data), nil
})
e.Log("command run: %v", cmd.Args)
e.StdLogger.Printf("command run: %v\n", cmd.Args)
e.Error = cmd.Run()
done.Lock()
@@ -627,7 +627,7 @@ func (e *RequestHandler) GitSubmoduleCommitId(cwd, packageName, commitId string)
foundLock.Lock()
e.Log("getting commit id '%s' from git at '%s' with packageName: %s", commitId, cwd, packageName)
e.StdLogger.Printf("getting commit id '%s' from git at '%s' with packageName: %s\n", commitId, cwd, packageName)
go func() {
defer foundLock.Unlock()
@@ -638,7 +638,7 @@ func (e *RequestHandler) GitSubmoduleCommitId(cwd, packageName, commitId string)
c, err := parseGitCommit(data_in.ch)
if err != nil {
e.Error = err
e.LogError("Error parsing git commit: %v", err)
e.ErrLogger.Printf("Error parsing git commit: %v\n", err)
return
}
data_out.Write([]byte(c.Tree))
@@ -647,7 +647,7 @@ func (e *RequestHandler) GitSubmoduleCommitId(cwd, packageName, commitId string)
if err != nil {
e.Error = err
e.LogError("Error parsing git tree: %v", err)
e.ErrLogger.Printf("Error parsing git tree: %v\n", err)
return
}
@@ -668,10 +668,10 @@ func (e *RequestHandler) GitSubmoduleCommitId(cwd, packageName, commitId string)
cmd.Stdout = &data_in
cmd.Stdin = &data_out
cmd.Stderr = writeFunc(func(data []byte) (int, error) {
e.Logger.LogError("%s", data)
e.ErrLogger.Println(data)
return len(data), nil
})
e.Log("command run: %v", cmd.Args)
e.StdLogger.Printf("command run: %v\n", cmd.Args)
e.Error = cmd.Run()
foundLock.Lock()