@ -141,7 +141,7 @@ func CreateOrUpdateRepoFile(ctx context.Context, repo *repo_model.Repository, do
defer closer . Close ( ) defer closer . Close ( )
// oldBranch must exist for this operation
// oldBranch must exist for this operation
if _ , err := gitRepo . GetBranch ( opts . OldBranch ) ; err != nil { if _ , err := gitRepo . GetBranch ( opts . OldBranch ) ; err != nil && ! repo . IsEmpty {
return nil , err return nil , err
} }
@ -191,118 +191,130 @@ func CreateOrUpdateRepoFile(ctx context.Context, repo *repo_model.Repository, do
log . Error ( "%v" , err ) log . Error ( "%v" , err )
} }
defer t . Close ( ) defer t . Close ( )
hasOldBranch := true
if err := t . Clone ( opts . OldBranch ) ; err != nil { if err := t . Clone ( opts . OldBranch ) ; err != nil {
return nil , err if ! git . IsErrBranchNotExist ( err ) || ! repo . IsEmpty {
} return nil , err
if err := t . SetDefaultIndex ( ) ; err != nil { }
return nil , err if err := t . Init ( ) ; err != nil {
} return nil , err
}
// Get the commit of the original branch
hasOldBranch = false
commit , err := t . GetBranchCommit ( opts . OldBranch ) opts . LastCommitID = ""
if err != nil {
return nil , err // Couldn't get a commit for the branch
} }
if hasOldBranch {
// Assigned LastCommitID in opts if it hasn't been set
if err := t . SetDefaultIndex ( ) ; err != nil {
if opts . LastCommitID == "" { return nil , err
opts . LastCommitID = commit . ID . String ( )
} else {
lastCommitID , err := t . gitRepo . ConvertToSHA1 ( opts . LastCommitID )
if err != nil {
return nil , fmt . Errorf ( "DeleteRepoFile: Invalid last commit ID: %v" , err )
} }
opts . LastCommitID = lastCommitID . String ( )
} }
encoding := "UTF-8" encoding := "UTF-8"
bom := false bom := false
executable := false executable := false
if ! opts . IsNewFile { if hasOldBranch {
fromEntry , err := commit . GetTreeEntryByPath ( fromTreePath ) // Get the commit of the original branch
commit , err := t . GetBranchCommit ( opts . OldBranch )
if err != nil { if err != nil {
return nil , err return nil , err // Couldn't get a commit for the branch
} }
if opts . SHA != "" {
// If a SHA was given and the SHA given doesn't match the SHA of the fromTreePath, throw error
// Assigned LastCommitID in opts if it hasn't been set
if opts . SHA != fromEntry . ID . String ( ) { if opts . LastCommitID == "" {
return nil , models . ErrSHADoesNotMatch { opts . LastCommitID = commit . ID . String ( )
Path : treePath , } else {
GivenSHA : opts . SHA , lastCommitID , err := t . gitRepo . ConvertToSHA1 ( opts . LastCommitID )
CurrentSHA : fromEntry . ID . String ( ) , if err != nil {
} return nil , fmt . Errorf ( "ConvertToSHA1: Invalid last commit ID: %v" , err )
} }
} else if opts . LastCommitID != "" { opts . LastCommitID = lastCommitID . String ( )
// If a lastCommitID was given and it doesn't match the commitID of the head of the branch throw
// an error, but only if we aren't creating a new branch.
}
if commit . ID . String ( ) != opts . LastCommitID && opts . OldBranch == opts . NewBranch {
if changed , err := commit . FileChangedSinceCommit ( treePath , opts . LastCommitID ) ; err != nil { if ! opts . IsNewFile {
return nil , err fromEntry , err := commit . GetTreeEntryByPath ( fromTreePath )
} else if changed { if err != nil {
return nil , models . ErrCommitIDDoesNotMatch { return nil , err
GivenCommitID : opts . LastCommitID , }
CurrentCommitID : opts . LastCommitID , if opts . SHA != "" {
// If a SHA was given and the SHA given doesn't match the SHA of the fromTreePath, throw error
if opts . SHA != fromEntry . ID . String ( ) {
return nil , models . ErrSHADoesNotMatch {
Path : treePath ,
GivenSHA : opts . SHA ,
CurrentSHA : fromEntry . ID . String ( ) ,
}
}
} else if opts . LastCommitID != "" {
// If a lastCommitID was given and it doesn't match the commitID of the head of the branch throw
// an error, but only if we aren't creating a new branch.
if commit . ID . String ( ) != opts . LastCommitID && opts . OldBranch == opts . NewBranch {
if changed , err := commit . FileChangedSinceCommit ( treePath , opts . LastCommitID ) ; err != nil {
return nil , err
} else if changed {
return nil , models . ErrCommitIDDoesNotMatch {
GivenCommitID : opts . LastCommitID ,
CurrentCommitID : opts . LastCommitID ,
}
} }
// The file wasn't modified, so we are good to delete it
} }
// The file wasn't modified, so we are good to delete it
} else {
// When updating a file, a lastCommitID or SHA needs to be given to make sure other commits
// haven't been made. We throw an error if one wasn't provided.
return nil , models . ErrSHAOrCommitIDNotProvided { }
} }
} else { encoding , bom = detectEncodingAndBOM ( fromEntry , repo )
// When updating a file, a lastCommitID or SHA needs to be given to make sure other commits
executable = fromEntry . IsExecutable ( )
// haven't been made. We throw an error if one wasn't provided.
return nil , models . ErrSHAOrCommitIDNotProvided { }
} }
encoding , bom = detectEncodingAndBOM ( fromEntry , repo )
executable = fromEntry . IsExecutable ( ) // For the path where this file will be created/updated, we need to make
} // sure no parts of the path are existing files or links except for the last
// item in the path which is the file name, and that shouldn't exist IF it is
// For the path where this file will be created/updated, we need to make
// a new file OR is being moved to a new path.
// sure no parts of the path are existing files or links except for the last
treePathParts := strings . Split ( treePath , "/" )
// item in the path which is the file name, and that shouldn't exist IF it is
subTreePath := ""
// a new file OR is being moved to a new path.
for index , part := range treePathParts {
treePathParts := strings . Split ( treePath , "/" ) subTreePath = path . Join ( subTreePath , part )
subTreePath := "" entry , err := commit . GetTreeEntryByPath ( subTreePath )
for index , part := range treePathParts { if err != nil {
subTreePath = path . Join ( subTreePath , part ) if git . IsErrNotExist ( err ) {
entry , err := commit . GetTreeEntryByPath ( subTreePath ) // Means there is no item with that name, so we're good
if err != nil { break
if git . IsErrNotExist ( err ) { }
// Means there is no item with that name, so we're good
return nil , err
break
} }
return nil , err if index < len ( treePathParts ) - 1 {
} if ! entry . IsDir ( ) {
if index < len ( treePathParts ) - 1 { return nil , models . ErrFilePathInvalid {
if ! entry . IsDir ( ) { Message : fmt . Sprintf ( "a file exists where you’re trying to create a subdirectory [path: %s]" , subTreePath ) ,
Path : subTreePath ,
Name : part ,
Type : git . EntryModeBlob ,
}
}
} else if entry . IsLink ( ) {
return nil , models . ErrFilePathInvalid { return nil , models . ErrFilePathInvalid {
Message : fmt . Sprintf ( "a file exists where you’re trying to create a subdirectory [path: %s]" , subTreePath ) , Message : fmt . Sprintf ( "a symbolic link exists where you’re trying to create a subdirectory [path: %s]" , subTreePath ) ,
Path : subTreePath , Path : subTreePath ,
Name : part , Name : part ,
Type : git . EntryModeBlob , Type : git . EntryModeSymlink ,
}
} else if entry . IsDir ( ) {
return nil , models . ErrFilePathInvalid {
Message : fmt . Sprintf ( "a directory exists where you’re trying to create a file [path: %s]" , subTreePath ) ,
Path : subTreePath ,
Name : part ,
Type : git . EntryModeTree ,
}
} else if fromTreePath != treePath || opts . IsNewFile {
// The entry shouldn't exist if we are creating new file or moving to a new path
return nil , models . ErrRepoFileAlreadyExists {
Path : treePath ,
} }
} }
} else if entry . IsLink ( ) {
return nil , models . ErrFilePathInvalid {
Message : fmt . Sprintf ( "a symbolic link exists where you’re trying to create a subdirectory [path: %s]" , subTreePath ) ,
Path : subTreePath ,
Name : part ,
Type : git . EntryModeSymlink ,
}
} else if entry . IsDir ( ) {
return nil , models . ErrFilePathInvalid {
Message : fmt . Sprintf ( "a directory exists where you’re trying to create a file [path: %s]" , subTreePath ) ,
Path : subTreePath ,
Name : part ,
Type : git . EntryModeTree ,
}
} else if fromTreePath != treePath || opts . IsNewFile {
// The entry shouldn't exist if we are creating new file or moving to a new path
return nil , models . ErrRepoFileAlreadyExists {
Path : treePath ,
}
}
}
} }
// 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
@ -354,7 +366,7 @@ func CreateOrUpdateRepoFile(ctx context.Context, repo *repo_model.Repository, do
opts . Content = content opts . Content = content
var lfsMetaObject * models . LFSMetaObject var lfsMetaObject * models . LFSMetaObject
if setting . LFS . StartServer { if setting . LFS . StartServer && hasOldBranch {
// Check there is no way this can return multiple infos
// Check there is no way this can return multiple infos
filename2attribute2info , err := t . gitRepo . CheckAttribute ( git . CheckAttributeOpts { filename2attribute2info , err := t . gitRepo . CheckAttribute ( git . CheckAttributeOpts {
Attributes : [ ] string { "filter" } , Attributes : [ ] string { "filter" } ,
@ -401,9 +413,9 @@ func CreateOrUpdateRepoFile(ctx context.Context, repo *repo_model.Repository, do
// Now commit the tree
// Now commit the tree
var commitHash string var commitHash string
if opts . Dates != nil { if opts . Dates != nil {
commitHash , err = t . CommitTreeWithDate ( author , committer , treeHash , message , opts . Signoff , opts . Dates . Author , opts . Dates . Committer ) commitHash , err = t . CommitTreeWithDate ( opts . LastCommitID , author , committer , treeHash , message , opts . Signoff , opts . Dates . Author , opts . Dates . Committer )
} else { } else {
commitHash , err = t . CommitTree ( author , committer , treeHash , message , opts . Signoff ) commitHash , err = t . CommitTree ( opts . LastCommitID , author , committer , treeHash , message , opts . Signoff )
} }
if err != nil { if err != nil {
return nil , err return nil , err
@ -436,7 +448,7 @@ func CreateOrUpdateRepoFile(ctx context.Context, repo *repo_model.Repository, do
return nil , err return nil , err
} }
commit , err = t . GetCommit ( commitHash ) commit , err : =t . GetCommit ( commitHash )
if err != nil { if err != nil {
return nil , err return nil , err
} }
zeripath
3 years ago
committed by
GitHub