Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 10:14:40 +02:00
Code Issues Activity

Syntax and comment changes

Browse Source
This commit is contained in:
bytedream 2025-05-05 21:12:29 +02:00
parent 02fe2dbe37
commit 2698321eb1
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
services/repository/files/update.go
View File

@ -461,11 +461,6 @@ func handleCheckErrors(file *ChangeRepoFile, commit *git.Commit, opts *ChangeRep
// CreateOrUpdateFile handles creating or updating a file for ChangeRepoFiles // CreateOrUpdateFile handles creating or updating a file for ChangeRepoFiles
func CreateOrUpdateFile(ctx context.Context, t *TemporaryUploadRepository, file *ChangeRepoFile, contentStore *lfs.ContentStore, repoID int64, hasOldBranch bool) error { func CreateOrUpdateFile(ctx context.Context, t *TemporaryUploadRepository, file *ChangeRepoFile, contentStore *lfs.ContentStore, repoID int64, hasOldBranch bool) error {
// ContentReader is only allowed to be nil if the file is moving
if file.ContentReader == nil && file.TreePath == file.FromTreePath {
return nil
}
// Get the two paths (might be the same if not moving) from the index if they exist // Get the two paths (might be the same if not moving) from the index if they exist
filesInIndex, err := t.LsFiles(ctx, file.TreePath, file.FromTreePath) filesInIndex, err := t.LsFiles(ctx, file.TreePath, file.FromTreePath)
if err != nil { if err != nil {
@ -495,21 +490,21 @@ func CreateOrUpdateFile(ctx context.Context, t *TemporaryUploadRepository, file
var treeObjectContentReader io.Reader = file.ContentReader var treeObjectContentReader io.Reader = file.ContentReader
var oldEntry *git.TreeEntry var oldEntry *git.TreeEntry
// If nil, use the existing content // If no new content should be commited, use the file from the last commit as content
if file.ContentReader == nil { if file.ContentReader == nil {
lastCommit, _ := t.GetLastCommit(ctx) lastCommit, err := t.GetLastCommit(ctx)
if err != nil {
return err
}
commit, err := t.GetCommit(lastCommit) commit, err := t.GetCommit(lastCommit)
if err != nil { if err != nil {
return err return err
} }
oldEntry, err = commit.GetTreeEntryByPath(file.Options.fromTreePath) if oldEntry, err = commit.GetTreeEntryByPath(file.Options.fromTreePath); err != nil {
if err != nil {
return err return err
} }
if treeObjectContentReader, err = oldEntry.Blob().DataAsync(); err != nil {
treeObjectContentReader, err = oldEntry.Blob().DataAsync()
if err != nil {
return err return err
} }
} }
@ -526,7 +521,7 @@ func CreateOrUpdateFile(ctx context.Context, t *TemporaryUploadRepository, file
} }
var pointer *lfs.Pointer var pointer *lfs.Pointer
// Get existing lfs pointer if the old tree path is in lfs // Get existing lfs pointer if the old path is in lfs
if oldEntry != nil && attributesMap[file.Options.fromTreePath] != nil && attributesMap[file.Options.fromTreePath].Get(attribute.Filter).ToString().Value() == "lfs" { if oldEntry != nil && attributesMap[file.Options.fromTreePath] != nil && attributesMap[file.Options.fromTreePath].Get(attribute.Filter).ToString().Value() == "lfs" {
pointerReader, err := oldEntry.Blob().DataAsync() pointerReader, err := oldEntry.Blob().DataAsync()
if err != nil { if err != nil {
@ -540,7 +535,7 @@ func CreateOrUpdateFile(ctx context.Context, t *TemporaryUploadRepository, file
} }
if attributesMap[file.Options.treePath] != nil && attributesMap[file.Options.treePath].Get(attribute.Filter).ToString().Value() == "lfs" { if attributesMap[file.Options.treePath] != nil && attributesMap[file.Options.treePath].Get(attribute.Filter).ToString().Value() == "lfs" {
// Only generate a new lfs pointer if the old tree path isn't in lfs or the object content is changed // Only generate a new lfs pointer if the old path isn't in lfs or the object content changes
if pointer == nil { if pointer == nil {
p, err := lfs.GeneratePointer(treeObjectContentReader) p, err := lfs.GeneratePointer(treeObjectContentReader)
if err != nil { if err != nil {
@ -589,14 +584,12 @@ func CreateOrUpdateFile(ctx context.Context, t *TemporaryUploadRepository, file
if !exist { if !exist {
var lfsContentReader io.Reader var lfsContentReader io.Reader
if file.ContentReader != nil { if file.ContentReader != nil {
_, err := file.ContentReader.Seek(0, io.SeekStart) if _, err := file.ContentReader.Seek(0, io.SeekStart); err != nil {
if err != nil {
return err return err
} }
lfsContentReader = file.ContentReader lfsContentReader = file.ContentReader
} else { } else {
lfsContentReader, err = oldEntry.Blob().DataAsync() if lfsContentReader, err = oldEntry.Blob().DataAsync(); err != nil {
if err != nil {
return err return err
} }
} }