mirror of
https://github.com/go-gitea/gitea.git
synced 2026-02-23 12:55:43 +01:00
8cc8150922
* Fix #35252 * Fix #35999 * Improve diff rendering, don't add unnecessary "added"/"removed" tags for a full-line change * Also fix a "space trimming" bug in #36539 and add tests * Use chroma "SQL" lexer instead of "MySQL" to workaround a bug (35999)
43 lines
1.1 KiB
Go
43 lines
1.1 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package files
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/services/gitdiff"
|
|
)
|
|
|
|
// GetDiffPreview produces and returns diff result of a file which is not yet committed.
|
|
func GetDiffPreview(ctx context.Context, repo *repo_model.Repository, branch, treePath, oldContent, newContent string) (*gitdiff.Diff, error) {
|
|
if branch == "" {
|
|
branch = repo.DefaultBranch
|
|
}
|
|
t, err := NewTemporaryUploadRepository(repo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer t.Close()
|
|
if err := t.Clone(ctx, branch, true); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := t.SetDefaultIndex(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Add the object to the database
|
|
objectHash, err := t.HashObjectAndWrite(ctx, strings.NewReader(newContent))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Add the object to the index
|
|
if err := t.AddObjectToIndex(ctx, "100644", objectHash, treePath); err != nil {
|
|
return nil, err
|
|
}
|
|
return t.DiffIndex(ctx, oldContent, newContent)
|
|
}
|