@ -382,8 +382,8 @@ func (diffFile *DiffFile) GetType() int {
} }
// GetTailSection creates a fake DiffLineSection if the last section is not the end of the file
// GetTailSection creates a fake DiffLineSection if the last section is not the end of the file
func ( diffFile * DiffFile ) GetTailSection ( gitRepo * git . Repository , leftCommit, rightCommit * git . Commit ) * DiffSection { func ( diffFile * DiffFile ) GetTailSection ( , rightCommit * git . Commit ) * DiffSection {
if len ( diffFile . Sections ) == 0 || . Type != DiffFileChange || diffFile . IsBin || diffFile . IsLFSFile {
if len ( diffFile . Sections ) == 0 || leftCommit == nil || diffFile. Type != DiffFileChange || diffFile . IsBin || diffFile . IsLFSFile {
return nil
return nil
}
}
@ -452,12 +452,10 @@ func getCommitFileLineCount(commit *git.Commit, filePath string) int {
// Diff represents a difference between two git trees.
// Diff represents a difference between two git trees.
type Diff struct { type Diff struct {
Start , End string
Start , End string
NumFiles int
Files [ ] * DiffFile
TotalAddition , TotalDeletion int
IsIncomplete bool
Files [ ] * DiffFile
NumViewedFiles int // user-specific
IsIncomplete bool
NumViewedFiles int // user-specific
} }
// LoadComments loads comments into each line
// LoadComments loads comments into each line
@ -699,8 +697,6 @@ parsingLoop:
}
}
// Otherwise do nothing with this line, but now switch to parsing hunks
// Otherwise do nothing with this line, but now switch to parsing hunks
lineBytes , isFragment , err := parseHunks ( ctx , curFile , maxLines , maxLineCharacters , input )
lineBytes , isFragment , err := parseHunks ( ctx , curFile , maxLines , maxLineCharacters , input )
diff . TotalAddition += curFile . Addition
diff . TotalDeletion += curFile . Deletion
if err != nil {
if err != nil {
if err != io . EOF {
if err != io . EOF {
return diff , err
return diff , err
@ -773,7 +769,6 @@ parsingLoop:
}
}
}
}
diff . NumFiles = len ( diff . Files )
return diff , nil
return diff , nil
} }
@ -1104,7 +1099,26 @@ type DiffOptions struct {
MaxFiles int
MaxFiles int
WhitespaceBehavior git . TrustedCmdArgs
WhitespaceBehavior git . TrustedCmdArgs
DirectComparison bool
DirectComparison bool
FileOnly bool
}
func guessBeforeCommitForDiff ( gitRepo * git . Repository , beforeCommitID string , afterCommit * git . Commit ) ( actualBeforeCommit * git . Commit , actualBeforeCommitID git . ObjectID , err error ) {
commitObjectFormat := afterCommit . ID . Type ( )
isBeforeCommitIDEmpty := beforeCommitID == "" || beforeCommitID == commitObjectFormat . EmptyObjectID ( ) . String ( )
if isBeforeCommitIDEmpty && afterCommit . ParentCount ( ) == 0 {
actualBeforeCommitID = commitObjectFormat . EmptyTree ( )
} else {
if isBeforeCommitIDEmpty {
actualBeforeCommit , err = afterCommit . Parent ( 0 )
} else {
actualBeforeCommit , err = gitRepo . GetCommit ( beforeCommitID )
}
if err != nil {
return nil , nil , err
}
actualBeforeCommitID = actualBeforeCommit . ID
}
return actualBeforeCommit , actualBeforeCommitID , nil
} }
// GetDiff builds a Diff between two commits of a repository.
// GetDiff builds a Diff between two commits of a repository.
@ -1113,46 +1127,19 @@ type DiffOptions struct {
func GetDiff ( ctx context . Context , gitRepo * git . Repository , opts * DiffOptions , files ... string ) ( * Diff , error ) { func GetDiff ( ctx context . Context , gitRepo * git . Repository , opts * DiffOptions , files ... string ) ( * Diff , error ) {
repoPath := gitRepo . Path
repoPath := gitRepo . Path
var beforeCommit * git . Commit
afterCommit , err := gitRepo . GetCommit ( opts . AfterCommitID )
commit , err := gitRepo . GetCommit ( opts . AfterCommitID )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
cmdCtx , cmdCancel := context . WithCancel ( ctx )
actualBeforeCommit , actualBeforeCommitID , err := guessBeforeCommitForDiff ( gitRepo , opts . BeforeCommitID , afterCommit )
defer cmdCancel ( )
cmdDiff := git . NewCommand ( )
objectFormat , err := gitRepo . GetObjectFormat ( )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
if ( len ( opts . BeforeCommitID ) == 0 || opts . BeforeCommitID == objectFormat . EmptyObjectID ( ) . String ( ) ) && commit . ParentCount ( ) == 0 {
cmdDiff := git . NewCommand ( ) .
cmdDiff . AddArguments ( "diff" , "--src-prefix=\\a/" , "--dst-prefix=\\b/" , "-M" ) .
AddArguments ( "diff" , "--src-prefix=\\a/" , "--dst-prefix=\\b/" , "-M" ) .
AddArguments ( opts . WhitespaceBehavior ... ) .
AddArguments ( opts . WhitespaceBehavior ... )
AddDynamicArguments ( objectFormat . EmptyTree ( ) . String ( ) ) .
AddDynamicArguments ( opts . AfterCommitID )
} else {
actualBeforeCommitID := opts . BeforeCommitID
if len ( actualBeforeCommitID ) == 0 {
parentCommit , err := commit . Parent ( 0 )
if err != nil {
return nil , err
}
actualBeforeCommitID = parentCommit . ID . String ( )
}
cmdDiff . AddArguments ( "diff" , "--src-prefix=\\a/" , "--dst-prefix=\\b/" , "-M" ) .
AddArguments ( opts . WhitespaceBehavior ... ) .
AddDynamicArguments ( actualBeforeCommitID , opts . AfterCommitID )
opts . BeforeCommitID = actualBeforeCommitID
beforeCommit , err = gitRepo . GetCommit ( opts . BeforeCommitID )
if err != nil {
return nil , err
}
}
// In git 2.31, git diff learned --skip-to which we can use to shortcut skip to file
// In git 2.31, git diff learned --skip-to which we can use to shortcut skip to file
// so if we are using at least this version of git we don't have to tell ParsePatch to do
// so if we are using at least this version of git we don't have to tell ParsePatch to do
@ -1163,8 +1150,12 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
parsePatchSkipToFile = ""
parsePatchSkipToFile = ""
}
}
cmdDiff . AddDynamicArguments ( actualBeforeCommitID . String ( ) , opts . AfterCommitID )
cmdDiff . AddDashesAndList ( files ... )
cmdDiff . AddDashesAndList ( files ... )
cmdCtx , cmdCancel := context . WithCancel ( ctx )
defer cmdCancel ( )
reader , writer := io . Pipe ( )
reader , writer := io . Pipe ( )
defer func ( ) {
defer func ( ) {
_ = reader . Close ( )
_ = reader . Close ( )
@ -1214,7 +1205,7 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
// Populate Submodule URLs
// Populate Submodule URLs
if diffFile . SubmoduleDiffInfo != nil {
if diffFile . SubmoduleDiffInfo != nil {
diffFile . SubmoduleDiffInfo . PopulateURL ( diffFile , beforeCommit, c ommit)
diffFile . SubmoduleDiffInfo . PopulateURL ( diffFile , actualBeforeCommit, afterC ommit)
}
}
if ! isVendored . Has ( ) {
if ! isVendored . Has ( ) {
@ -1227,75 +1218,45 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
}
}
diffFile . IsGenerated = isGenerated . Value ( )
diffFile . IsGenerated = isGenerated . Value ( )
tailSection := diffFile . GetTailSection ( gitRepo, beforeCommit , c ommit)
tailSection := diffFile . GetTailSection ( actualBeforeCommit, afterC ommit)
if tailSection != nil {
if tailSection != nil {
diffFile . Sections = append ( diffFile . Sections , tailSection )
diffFile . Sections = append ( diffFile . Sections , tailSection )
}
}
}
}
if opts . FileOnly {
return diff , nil
}
stats , err := GetPullDiffStats ( gitRepo , opts )
if err != nil {
return nil , err
}
diff . NumFiles , diff . TotalAddition , diff . TotalDeletion = stats . NumFiles , stats . TotalAddition , stats . TotalDeletion
return diff , nil
return diff , nil
} }
type Pull DiffStats struct { type DiffShortStat struct {
NumFiles , TotalAddition , TotalDeletion int
NumFiles , TotalAddition , TotalDeletion int
} }
// GetPullDiffStats
func GetDiffShortStat ( gitRepo * git . Repository , beforeCommitID , afterCommitID string ) ( * DiffShortStat , error ) {
func GetPullDiffStats ( gitRepo * git . Repository , opts * DiffOptions ) ( * PullDiffStats , error ) {
repoPath := gitRepo . Path
repoPath := gitRepo . Path
diff := & PullDiffStats { }
afterCommit , err := gitRepo . GetCommit ( afterCommitID )
separator := "..."
if opts . DirectComparison {
separator = ".."
}
objectFormat , err := gitRepo . GetObjectFormat ( )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
diffPaths := [ ] string { opts . BeforeCommitID + separator + opts . AfterCommitID }
_ , actualBeforeCommitID , err := guessBeforeCommitForDiff ( gitRepo , beforeCommitID , afterCommit )
if len ( opts . BeforeCommitID ) == 0 || opts . BeforeCommitID == objectFormat . EmptyObjectID ( ) . String ( ) {
if err != nil {
diffPaths = [ ] string { objectFormat . EmptyTree ( ) . String ( ) , opts . AfterCommitID }
return nil , err
}
}
diff . NumFiles , diff . TotalAddition , diff . TotalDeletion , err = git . GetDiffShortStat ( gitRepo . Ctx , repoPath , nil , diffPaths ... )
diff := & DiffShortStat { }
if err != nil && strings . Contains ( err . Error ( ) , "no merge base" ) {
diff . NumFiles , diff . TotalAddition , diff . TotalDeletion , err = git . GetDiffShortStatByCmdArgs ( gitRepo . Ctx , repoPath , nil , actualBeforeCommitID . String ( ) , afterCommitID )
// git >= 2.28 now returns an error if base and head have become unrelated.
// previously it would return the results of git diff --shortstat base head so let's try that...
diffPaths = [ ] string { opts . BeforeCommitID , opts . AfterCommitID }
diff . NumFiles , diff . TotalAddition , diff . TotalDeletion , err = git . GetDiffShortStat ( gitRepo . Ctx , repoPath , nil , diffPaths ... )
}
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
return diff , nil
return diff , nil
} }
// SyncAndGetUserSpecificDiff is like GetDiff, except that user specific data such as which files the given user has already viewed on the given PR will also be set
// SyncUserSpecificDiff inserts user-specific data such as which files the user has already viewed on the given diff
// Additionally, the database asynchronously is updated if files have changed since the last review
// Additionally, the database is updated asynchronously if files have changed since the last review
func SyncAndGetUserSpecificDiff ( ctx context . Context , userID int64 , pull * issues_model . PullRequest , gitRepo * git . Repository , opts * DiffOptions , files ... string ) ( * Diff , error ) { func SyncUserSpecificDiff ( ctx context . Context , userID int64 , pull * issues_model . PullRequest , gitRepo * git . Repository , diff * Diff , opts * DiffOptions , files ... string ) error {
diff , err := GetDiff ( ctx , gitRepo , opts , files ... )
if err != nil {
return nil , err
}
review , err := pull_model . GetNewestReviewState ( ctx , userID , pull . ID )
review , err := pull_model . GetNewestReviewState ( ctx , userID , pull . ID )
if err != nil || review == nil || review . UpdatedFiles == nil {
if err != nil || review == nil || review . UpdatedFiles == nil {
return diff, err
return err
}
}
latestCommit := opts . AfterCommitID
latestCommit := opts . AfterCommitID
@ -1348,11 +1309,11 @@ outer:
err := pull_model . UpdateReviewState ( ctx , review . UserID , review . PullID , review . CommitSHA , filesChangedSinceLastDiff )
err := pull_model . UpdateReviewState ( ctx , review . UserID , review . PullID , review . CommitSHA , filesChangedSinceLastDiff )
if err != nil {
if err != nil {
log . Warn ( "Could not update review for user %d, pull %d, commit %s and the changed files %v: %v" , review . UserID , review . PullID , review . CommitSHA , filesChangedSinceLastDiff , err )
log . Warn ( "Could not update review for user %d, pull %d, commit %s and the changed files %v: %v" , review . UserID , review . PullID , review . CommitSHA , filesChangedSinceLastDiff , err )
return nil , err
return err
}
}
}
}
return diff , nil
return nil
} }
// CommentAsDiff returns c.Patch as *Diff
// CommentAsDiff returns c.Patch as *Diff
wxiaoguang
5 days ago
committed by
GitHub