2020-01-28 08:02:03 +00:00
|
|
|
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a MIT-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
package git
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bufio"
|
|
|
|
"bytes"
|
|
|
|
"context"
|
|
|
|
"fmt"
|
|
|
|
"io"
|
2021-09-11 14:21:17 +00:00
|
|
|
"os"
|
2020-01-28 08:02:03 +00:00
|
|
|
"regexp"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
|
2021-06-25 16:54:08 +00:00
|
|
|
"code.gitea.io/gitea/modules/log"
|
2020-01-28 08:02:03 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// RawDiffType type of a raw diff.
|
|
|
|
type RawDiffType string
|
|
|
|
|
|
|
|
// RawDiffType possible values.
|
|
|
|
const (
|
|
|
|
RawDiffNormal RawDiffType = "diff"
|
|
|
|
RawDiffPatch RawDiffType = "patch"
|
|
|
|
)
|
|
|
|
|
|
|
|
// GetRawDiff dumps diff results of repository in given commit ID to io.Writer.
|
2022-04-25 18:45:18 +00:00
|
|
|
func GetRawDiff(repo *Repository, commitID string, diffType RawDiffType, writer io.Writer) error {
|
|
|
|
return GetRepoRawDiffForFile(repo, "", commitID, diffType, "", writer)
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
|
2022-02-09 20:28:55 +00:00
|
|
|
// GetReverseRawDiff dumps the reverse diff results of repository in given commit ID to io.Writer.
|
|
|
|
func GetReverseRawDiff(ctx context.Context, repoPath, commitID string, writer io.Writer) error {
|
|
|
|
stderr := new(bytes.Buffer)
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd := NewCommand(ctx, "show", "--pretty=format:revert %H%n", "-R").AddDynamicArguments(commitID)
|
2022-04-01 02:55:30 +00:00
|
|
|
if err := cmd.Run(&RunOpts{
|
|
|
|
Dir: repoPath,
|
|
|
|
Stdout: writer,
|
|
|
|
Stderr: stderr,
|
2022-02-09 20:28:55 +00:00
|
|
|
}); err != nil {
|
2022-10-24 19:29:17 +00:00
|
|
|
return fmt.Errorf("Run: %w - %s", err, stderr)
|
2022-02-09 20:28:55 +00:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-01-28 08:02:03 +00:00
|
|
|
// GetRepoRawDiffForFile dumps diff results of file in given commit ID to io.Writer according given repository
|
|
|
|
func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diffType RawDiffType, file string, writer io.Writer) error {
|
|
|
|
commit, err := repo.GetCommit(endCommit)
|
|
|
|
if err != nil {
|
2021-04-01 05:17:14 +00:00
|
|
|
return err
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
2022-10-23 14:44:45 +00:00
|
|
|
var files []string
|
2020-01-28 08:02:03 +00:00
|
|
|
if len(file) > 0 {
|
2022-10-23 14:44:45 +00:00
|
|
|
files = append(files, file)
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd := NewCommand(repo.Ctx)
|
2020-01-28 08:02:03 +00:00
|
|
|
switch diffType {
|
|
|
|
case RawDiffNormal:
|
|
|
|
if len(startCommit) != 0 {
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments("diff", "-M").AddDynamicArguments(startCommit, endCommit).AddDashesAndList(files...)
|
2020-01-28 08:02:03 +00:00
|
|
|
} else if commit.ParentCount() == 0 {
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments("show").AddDynamicArguments(endCommit).AddDashesAndList(files...)
|
2020-01-28 08:02:03 +00:00
|
|
|
} else {
|
|
|
|
c, _ := commit.Parent(0)
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments("diff", "-M").AddDynamicArguments(c.ID.String(), endCommit).AddDashesAndList(files...)
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
case RawDiffPatch:
|
|
|
|
if len(startCommit) != 0 {
|
|
|
|
query := fmt.Sprintf("%s...%s", endCommit, startCommit)
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments("format-patch", "--no-signature", "--stdout", "--root").AddDynamicArguments(query).AddDashesAndList(files...)
|
2020-01-28 08:02:03 +00:00
|
|
|
} else if commit.ParentCount() == 0 {
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments("format-patch", "--no-signature", "--stdout", "--root").AddDynamicArguments(endCommit).AddDashesAndList(files...)
|
2020-01-28 08:02:03 +00:00
|
|
|
} else {
|
|
|
|
c, _ := commit.Parent(0)
|
|
|
|
query := fmt.Sprintf("%s...%s", endCommit, c.ID.String())
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments("format-patch", "--no-signature", "--stdout").AddDynamicArguments(query).AddDashesAndList(files...)
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
default:
|
|
|
|
return fmt.Errorf("invalid diffType: %s", diffType)
|
|
|
|
}
|
|
|
|
|
|
|
|
stderr := new(bytes.Buffer)
|
2022-04-01 02:55:30 +00:00
|
|
|
if err = cmd.Run(&RunOpts{
|
|
|
|
Dir: repo.Path,
|
|
|
|
Stdout: writer,
|
|
|
|
Stderr: stderr,
|
2022-01-23 05:57:52 +00:00
|
|
|
}); err != nil {
|
2022-10-24 19:29:17 +00:00
|
|
|
return fmt.Errorf("Run: %w - %s", err, stderr)
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ParseDiffHunkString parse the diffhunk content and return
|
|
|
|
func ParseDiffHunkString(diffhunk string) (leftLine, leftHunk, rightLine, righHunk int) {
|
|
|
|
ss := strings.Split(diffhunk, "@@")
|
|
|
|
ranges := strings.Split(ss[1][1:], " ")
|
|
|
|
leftRange := strings.Split(ranges[0], ",")
|
|
|
|
leftLine, _ = strconv.Atoi(leftRange[0][1:])
|
|
|
|
if len(leftRange) > 1 {
|
|
|
|
leftHunk, _ = strconv.Atoi(leftRange[1])
|
|
|
|
}
|
|
|
|
if len(ranges) > 1 {
|
|
|
|
rightRange := strings.Split(ranges[1], ",")
|
|
|
|
rightLine, _ = strconv.Atoi(rightRange[0])
|
|
|
|
if len(rightRange) > 1 {
|
|
|
|
righHunk, _ = strconv.Atoi(rightRange[1])
|
|
|
|
}
|
|
|
|
} else {
|
2021-06-25 16:54:08 +00:00
|
|
|
log.Debug("Parse line number failed: %v", diffhunk)
|
2020-01-28 08:02:03 +00:00
|
|
|
rightLine = leftLine
|
|
|
|
righHunk = leftHunk
|
|
|
|
}
|
2022-06-20 10:02:49 +00:00
|
|
|
return leftLine, leftHunk, rightLine, righHunk
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Example: @@ -1,8 +1,9 @@ => [..., 1, 8, 1, 9]
|
|
|
|
var hunkRegex = regexp.MustCompile(`^@@ -(?P<beginOld>[0-9]+)(,(?P<endOld>[0-9]+))? \+(?P<beginNew>[0-9]+)(,(?P<endNew>[0-9]+))? @@`)
|
|
|
|
|
|
|
|
const cmdDiffHead = "diff --git "
|
|
|
|
|
2021-02-27 18:46:14 +00:00
|
|
|
func isHeader(lof string, inHunk bool) bool {
|
|
|
|
return strings.HasPrefix(lof, cmdDiffHead) || (!inHunk && (strings.HasPrefix(lof, "---") || strings.HasPrefix(lof, "+++")))
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// CutDiffAroundLine cuts a diff of a file in way that only the given line + numberOfLine above it will be shown
|
|
|
|
// it also recalculates hunks and adds the appropriate headers to the new diff.
|
|
|
|
// Warning: Only one-file diffs are allowed.
|
2021-02-27 18:46:14 +00:00
|
|
|
func CutDiffAroundLine(originalDiff io.Reader, line int64, old bool, numbersOfLine int) (string, error) {
|
2020-01-28 08:02:03 +00:00
|
|
|
if line == 0 || numbersOfLine == 0 {
|
|
|
|
// no line or num of lines => no diff
|
2021-02-27 18:46:14 +00:00
|
|
|
return "", nil
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
2021-02-27 18:46:14 +00:00
|
|
|
|
2020-01-28 08:02:03 +00:00
|
|
|
scanner := bufio.NewScanner(originalDiff)
|
|
|
|
hunk := make([]string, 0)
|
2021-02-27 18:46:14 +00:00
|
|
|
|
2020-01-28 08:02:03 +00:00
|
|
|
// begin is the start of the hunk containing searched line
|
|
|
|
// end is the end of the hunk ...
|
|
|
|
// currentLine is the line number on the side of the searched line (differentiated by old)
|
|
|
|
// otherLine is the line number on the opposite side of the searched line (differentiated by old)
|
|
|
|
var begin, end, currentLine, otherLine int64
|
|
|
|
var headerLines int
|
2021-02-27 18:46:14 +00:00
|
|
|
|
|
|
|
inHunk := false
|
|
|
|
|
2020-01-28 08:02:03 +00:00
|
|
|
for scanner.Scan() {
|
|
|
|
lof := scanner.Text()
|
|
|
|
// Add header to enable parsing
|
2021-02-27 18:46:14 +00:00
|
|
|
|
|
|
|
if isHeader(lof, inHunk) {
|
|
|
|
if strings.HasPrefix(lof, cmdDiffHead) {
|
|
|
|
inHunk = false
|
|
|
|
}
|
2020-01-28 08:02:03 +00:00
|
|
|
hunk = append(hunk, lof)
|
|
|
|
headerLines++
|
|
|
|
}
|
|
|
|
if currentLine > line {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
// Detect "hunk" with contains commented lof
|
|
|
|
if strings.HasPrefix(lof, "@@") {
|
2021-02-27 18:46:14 +00:00
|
|
|
inHunk = true
|
2020-01-28 08:02:03 +00:00
|
|
|
// Already got our hunk. End of hunk detected!
|
|
|
|
if len(hunk) > headerLines {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
// A map with named groups of our regex to recognize them later more easily
|
|
|
|
submatches := hunkRegex.FindStringSubmatch(lof)
|
|
|
|
groups := make(map[string]string)
|
|
|
|
for i, name := range hunkRegex.SubexpNames() {
|
|
|
|
if i != 0 && name != "" {
|
|
|
|
groups[name] = submatches[i]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if old {
|
|
|
|
begin, _ = strconv.ParseInt(groups["beginOld"], 10, 64)
|
|
|
|
end, _ = strconv.ParseInt(groups["endOld"], 10, 64)
|
|
|
|
// init otherLine with begin of opposite side
|
|
|
|
otherLine, _ = strconv.ParseInt(groups["beginNew"], 10, 64)
|
|
|
|
} else {
|
|
|
|
begin, _ = strconv.ParseInt(groups["beginNew"], 10, 64)
|
|
|
|
if groups["endNew"] != "" {
|
|
|
|
end, _ = strconv.ParseInt(groups["endNew"], 10, 64)
|
|
|
|
} else {
|
|
|
|
end = 0
|
|
|
|
}
|
|
|
|
// init otherLine with begin of opposite side
|
|
|
|
otherLine, _ = strconv.ParseInt(groups["beginOld"], 10, 64)
|
|
|
|
}
|
|
|
|
end += begin // end is for real only the number of lines in hunk
|
|
|
|
// lof is between begin and end
|
|
|
|
if begin <= line && end >= line {
|
|
|
|
hunk = append(hunk, lof)
|
|
|
|
currentLine = begin
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
} else if len(hunk) > headerLines {
|
|
|
|
hunk = append(hunk, lof)
|
|
|
|
// Count lines in context
|
|
|
|
switch lof[0] {
|
|
|
|
case '+':
|
|
|
|
if !old {
|
|
|
|
currentLine++
|
|
|
|
} else {
|
|
|
|
otherLine++
|
|
|
|
}
|
|
|
|
case '-':
|
|
|
|
if old {
|
|
|
|
currentLine++
|
|
|
|
} else {
|
|
|
|
otherLine++
|
|
|
|
}
|
2021-12-20 02:15:49 +00:00
|
|
|
case '\\':
|
|
|
|
// FIXME: handle `\ No newline at end of file`
|
2020-01-28 08:02:03 +00:00
|
|
|
default:
|
|
|
|
currentLine++
|
|
|
|
otherLine++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-02-09 20:28:55 +00:00
|
|
|
if err := scanner.Err(); err != nil {
|
2021-02-27 18:46:14 +00:00
|
|
|
return "", err
|
|
|
|
}
|
2020-01-28 08:02:03 +00:00
|
|
|
|
|
|
|
// No hunk found
|
|
|
|
if currentLine == 0 {
|
2021-02-27 18:46:14 +00:00
|
|
|
return "", nil
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
// headerLines + hunkLine (1) = totalNonCodeLines
|
|
|
|
if len(hunk)-headerLines-1 <= numbersOfLine {
|
|
|
|
// No need to cut the hunk => return existing hunk
|
2021-02-27 18:46:14 +00:00
|
|
|
return strings.Join(hunk, "\n"), nil
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
|
|
|
var oldBegin, oldNumOfLines, newBegin, newNumOfLines int64
|
|
|
|
if old {
|
|
|
|
oldBegin = currentLine
|
|
|
|
newBegin = otherLine
|
|
|
|
} else {
|
|
|
|
oldBegin = otherLine
|
|
|
|
newBegin = currentLine
|
|
|
|
}
|
|
|
|
// headers + hunk header
|
|
|
|
newHunk := make([]string, headerLines)
|
|
|
|
// transfer existing headers
|
|
|
|
copy(newHunk, hunk[:headerLines])
|
|
|
|
// transfer last n lines
|
|
|
|
newHunk = append(newHunk, hunk[len(hunk)-numbersOfLine-1:]...)
|
|
|
|
// calculate newBegin, ... by counting lines
|
|
|
|
for i := len(hunk) - 1; i >= len(hunk)-numbersOfLine; i-- {
|
|
|
|
switch hunk[i][0] {
|
|
|
|
case '+':
|
|
|
|
newBegin--
|
|
|
|
newNumOfLines++
|
|
|
|
case '-':
|
|
|
|
oldBegin--
|
|
|
|
oldNumOfLines++
|
|
|
|
default:
|
|
|
|
oldBegin--
|
|
|
|
newBegin--
|
|
|
|
newNumOfLines++
|
|
|
|
oldNumOfLines++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// construct the new hunk header
|
|
|
|
newHunk[headerLines] = fmt.Sprintf("@@ -%d,%d +%d,%d @@",
|
|
|
|
oldBegin, oldNumOfLines, newBegin, newNumOfLines)
|
2021-02-27 18:46:14 +00:00
|
|
|
return strings.Join(newHunk, "\n"), nil
|
2020-01-28 08:02:03 +00:00
|
|
|
}
|
2021-09-11 14:21:17 +00:00
|
|
|
|
|
|
|
// GetAffectedFiles returns the affected files between two commits
|
2022-01-19 23:26:57 +00:00
|
|
|
func GetAffectedFiles(repo *Repository, oldCommitID, newCommitID string, env []string) ([]string, error) {
|
2021-09-11 14:21:17 +00:00
|
|
|
stdoutReader, stdoutWriter, err := os.Pipe()
|
|
|
|
if err != nil {
|
|
|
|
log.Error("Unable to create os.Pipe for %s", repo.Path)
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
_ = stdoutReader.Close()
|
|
|
|
_ = stdoutWriter.Close()
|
|
|
|
}()
|
|
|
|
|
|
|
|
affectedFiles := make([]string, 0, 32)
|
|
|
|
|
|
|
|
// Run `git diff --name-only` to get the names of the changed files
|
2022-10-23 14:44:45 +00:00
|
|
|
err = NewCommand(repo.Ctx, "diff", "--name-only").AddDynamicArguments(oldCommitID, newCommitID).
|
2022-04-01 02:55:30 +00:00
|
|
|
Run(&RunOpts{
|
|
|
|
Env: env,
|
|
|
|
Dir: repo.Path,
|
|
|
|
Stdout: stdoutWriter,
|
2022-02-11 12:47:22 +00:00
|
|
|
PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
|
2021-09-11 14:21:17 +00:00
|
|
|
// Close the writer end of the pipe to begin processing
|
|
|
|
_ = stdoutWriter.Close()
|
|
|
|
defer func() {
|
|
|
|
// Close the reader on return to terminate the git command if necessary
|
|
|
|
_ = stdoutReader.Close()
|
|
|
|
}()
|
|
|
|
// Now scan the output from the command
|
|
|
|
scanner := bufio.NewScanner(stdoutReader)
|
|
|
|
for scanner.Scan() {
|
|
|
|
path := strings.TrimSpace(scanner.Text())
|
|
|
|
if len(path) == 0 {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
affectedFiles = append(affectedFiles, path)
|
|
|
|
}
|
|
|
|
return scanner.Err()
|
2022-02-11 12:47:22 +00:00
|
|
|
},
|
|
|
|
})
|
2021-09-11 14:21:17 +00:00
|
|
|
if err != nil {
|
|
|
|
log.Error("Unable to get affected files for commits from %s to %s in %s: %v", oldCommitID, newCommitID, repo.Path, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return affectedFiles, err
|
|
|
|
}
|