From 54e0ada9d53c28543a436d266dc73e759cc7658b Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 14 Aug 2016 23:38:35 -0700 Subject: Web editor: improve delete file --- cmd/web.go | 11 +- models/repo.go | 37 ----- models/repo_editor.go | 60 +++++++ routers/repo/delete.go | 49 ------ routers/repo/edit.go | 329 -------------------------------------- routers/repo/editor.go | 340 ++++++++++++++++++++++++++++++++++++++++ routers/repo/view.go | 4 +- templates/repo/editor/edit.tmpl | 2 +- templates/repo/view_file.tmpl | 4 +- 9 files changed, 412 insertions(+), 424 deletions(-) delete mode 100644 routers/repo/delete.go delete mode 100644 routers/repo/edit.go create mode 100644 routers/repo/editor.go diff --git a/cmd/web.go b/cmd/web.go index db18890f1d..d14d1efcd9 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -503,14 +503,19 @@ func runWeb(ctx *cli.Context) error { Post(bindIgnErr(auth.EditRepoFileForm{}), repo.EditFilePost) m.Combo("/_new/*").Get(repo.NewFile). Post(bindIgnErr(auth.EditRepoFileForm{}), repo.NewFilePost) - m.Post("/preview/*", bindIgnErr(auth.EditPreviewDiffForm{}), repo.DiffPreviewPost) + m.Post("/_preview/*", bindIgnErr(auth.EditPreviewDiffForm{}), repo.DiffPreviewPost) m.Combo("/upload/*").Get(repo.UploadFile). Post(bindIgnErr(auth.UploadRepoFileForm{}), repo.UploadFilePost) - m.Post("/delete/*", bindIgnErr(auth.DeleteRepoFileForm{}), repo.DeleteFilePost) + m.Post("/_delete/*", bindIgnErr(auth.DeleteRepoFileForm{}), repo.DeleteFilePost) m.Post("/branches", bindIgnErr(auth.NewBranchForm{}), repo.NewBranchPost) m.Post("/upload-file", repo.UploadFileToServer) m.Post("/upload-remove", bindIgnErr(auth.RemoveUploadFileForm{}), repo.RemoveUploadFileFromServer) - }, reqRepoWriter, context.RepoRef()) + }, reqRepoWriter, context.RepoRef(), func(ctx *context.Context) { + if ctx.Repo.IsViewCommit { + ctx.Handle(404, "", nil) + return + } + }) }, reqSignIn, context.RepoAssignment(), repo.MustBeNotBare) m.Group("/:username/:reponame", func() { diff --git a/models/repo.go b/models/repo.go index 73950a9fb9..3c2c2650cb 100644 --- a/models/repo.go +++ b/models/repo.go @@ -2240,43 +2240,6 @@ func (repo *Repository) GetForks() ([]*Repository, error) { return forks, x.Find(&forks, &Repository{ForkID: repo.ID}) } -// ________ .__ __ ___________.__.__ -// \______ \ ____ | | _____/ |_ ____ \_ _____/|__| | ____ -// | | \_/ __ \| | _/ __ \ __\/ __ \ | __) | | | _/ __ \ -// | ` \ ___/| |_\ ___/| | \ ___/ | \ | | |_\ ___/ -// /_______ /\___ >____/\___ >__| \___ > \___ / |__|____/\___ > -// \/ \/ \/ \/ \/ \/ -// - -func (repo *Repository) DeleteRepoFile(doer *User, branch, treeName, message string) (err error) { - repoWorkingPool.CheckIn(com.ToStr(repo.ID)) - defer repoWorkingPool.CheckOut(com.ToStr(repo.ID)) - - localPath := repo.LocalCopyPath() - if err = discardLocalRepoBranchChanges(localPath, branch); err != nil { - return fmt.Errorf("discardLocalRepoChanges: %v", err) - } else if err = repo.UpdateLocalCopyBranch(branch); err != nil { - return fmt.Errorf("UpdateLocalCopyBranch: %v", err) - } - - filePath := path.Join(localPath, treeName) - os.Remove(filePath) - - if len(message) == 0 { - message = "Delete file '" + treeName + "'" - } - - if err = git.AddChanges(localPath, true); err != nil { - return fmt.Errorf("AddChanges: %v", err) - } else if err = git.CommitChanges(localPath, message, doer.NewGitSig()); err != nil { - return fmt.Errorf("CommitChanges: %v", err) - } else if err = git.Push(localPath, "origin", branch); err != nil { - return fmt.Errorf("Push: %v", err) - } - - return nil -} - // ____ ___ .__ .___ ___________.___.__ // | | \______ | | _________ __| _/ \_ _____/| | | ____ ______ // | | /\____ \| | / _ \__ \ / __ | | __) | | | _/ __ \ / ___/ diff --git a/models/repo_editor.go b/models/repo_editor.go index 843a58b576..070ffc3748 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -209,3 +209,63 @@ func (repo *Repository) GetDiffPreview(branch, treeName, content string) (diff * return diff, nil } + +// ________ .__ __ ___________.__.__ +// \______ \ ____ | | _____/ |_ ____ \_ _____/|__| | ____ +// | | \_/ __ \| | _/ __ \ __\/ __ \ | __) | | | _/ __ \ +// | ` \ ___/| |_\ ___/| | \ ___/ | \ | | |_\ ___/ +// /_______ /\___ >____/\___ >__| \___ > \___ / |__|____/\___ > +// \/ \/ \/ \/ \/ \/ +// + +func (repo *Repository) DeleteRepoFile(doer *User, oldCommitID, branch, treeName, message string) (err error) { + repoWorkingPool.CheckIn(com.ToStr(repo.ID)) + defer repoWorkingPool.CheckOut(com.ToStr(repo.ID)) + + localPath := repo.LocalCopyPath() + if err = discardLocalRepoBranchChanges(localPath, branch); err != nil { + return fmt.Errorf("discardLocalRepoChanges: %v", err) + } else if err = repo.UpdateLocalCopyBranch(branch); err != nil { + return fmt.Errorf("UpdateLocalCopyBranch: %v", err) + } + + filePath := path.Join(localPath, treeName) + os.Remove(filePath) + + if len(message) == 0 { + message = "Delete file '" + treeName + "'" + } + + if err = git.AddChanges(localPath, true); err != nil { + return fmt.Errorf("AddChanges: %v", err) + } else if err = git.CommitChanges(localPath, message, doer.NewGitSig()); err != nil { + return fmt.Errorf("CommitChanges: %v", err) + } else if err = git.Push(localPath, "origin", branch); err != nil { + return fmt.Errorf("Push: %v", err) + } + + gitRepo, err := git.OpenRepository(repo.RepoPath()) + if err != nil { + log.Error(4, "OpenRepository: %v", err) + return nil + } + commit, err := gitRepo.GetBranchCommit(branch) + if err != nil { + log.Error(4, "GetBranchCommit [branch: %s]: %v", branch, err) + return nil + } + + pushCommits := &PushCommits{ + Len: 1, + Commits: []*PushCommit{CommitToPushCommit(commit)}, + } + if err := CommitRepoAction(doer.ID, repo.MustOwner().ID, doer.Name, doer.Email, + repo.ID, repo.MustOwner().Name, repo.Name, git.BRANCH_PREFIX+branch, + pushCommits, oldCommitID, commit.ID.String()); err != nil { + log.Error(4, "CommitRepoAction: %v", err) + return nil + } + go HookQueue.Add(repo.ID) + + return nil +} diff --git a/routers/repo/delete.go b/routers/repo/delete.go deleted file mode 100644 index a0c615a6d7..0000000000 --- a/routers/repo/delete.go +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2016 The Gogs 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 repo - -import ( - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" - "github.com/gogits/gogs/modules/context" - "github.com/gogits/gogs/modules/log" -) - -func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) { - branchName := ctx.Repo.BranchName - treeName := ctx.Repo.TreeName - - if ctx.HasError() { - ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName) - return - } - - if err := ctx.Repo.Repository.DeleteRepoFile(ctx.User, branchName, treeName, form.CommitSummary); err != nil { - ctx.Handle(500, "DeleteRepoFile", err) - return - } - - // Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers - if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil { - log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err) - } else if commit, err := branch.GetCommit(); err != nil { - log.Error(4, "branch.GetCommit(): %v", err) - } else { - pc := &models.PushCommits{ - Len: 1, - Commits: []*models.PushCommit{models.CommitToPushCommit(commit)}, - } - oldCommitID := ctx.Repo.CommitID - newCommitID := commit.ID.String() - if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email, - ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc, - oldCommitID, newCommitID); err != nil { - log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err) - } - models.HookQueue.Add(ctx.Repo.Repository.ID) - } - - ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName) -} diff --git a/routers/repo/edit.go b/routers/repo/edit.go deleted file mode 100644 index 19c7c54474..0000000000 --- a/routers/repo/edit.go +++ /dev/null @@ -1,329 +0,0 @@ -// Copyright 2016 The Gogs 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 repo - -import ( - "io/ioutil" - "path" - "strings" - - "github.com/gogits/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/context" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/modules/template" -) - -const ( - EDIT base.TplName = "repo/editor/edit" - DIFF_PREVIEW base.TplName = "repo/editor/diff_preview" - DIFF_PREVIEW_NEW base.TplName = "repo/editor/diff_preview_new" -) - -func editFile(ctx *context.Context, isNewFile bool) { - // Don't allow edit a file in a specific commit. - if ctx.Repo.IsViewCommit { - ctx.Handle(404, "", nil) - return - } - - ctx.Data["PageIsEdit"] = true - ctx.Data["IsNewFile"] = isNewFile - ctx.Data["RequireHighlightJS"] = true - ctx.Data["RequireSimpleMDE"] = true - - branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchName - treeName := ctx.Repo.TreeName - - var treeNames []string - if len(treeName) > 0 { - treeNames = strings.Split(treeName, "/") - } - - if !isNewFile { - entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) - if err != nil { - if git.IsErrNotExist(err) { - ctx.Handle(404, "GetTreeEntryByPath", err) - } else { - ctx.Handle(500, "GetTreeEntryByPath", err) - } - return - } - - // No way to edit a directory online. - if entry.IsDir() { - ctx.Handle(404, "", nil) - return - } - - blob := entry.Blob() - dataRc, err := blob.Data() - if err != nil { - ctx.Handle(404, "blob.Data", err) - return - } - - ctx.Data["FileSize"] = blob.Size() - ctx.Data["FileName"] = blob.Name() - - buf := make([]byte, 1024) - n, _ := dataRc.Read(buf) - if n > 0 { - buf = buf[:n] - } - - // Only text file are editable online. - _, isTextFile := base.IsTextFile(buf) - if !isTextFile { - ctx.Handle(404, "", nil) - return - } - - d, _ := ioutil.ReadAll(dataRc) - buf = append(buf, d...) - if err, content := template.ToUTF8WithErr(buf); err != nil { - if err != nil { - log.Error(4, "Convert content encoding: %s", err) - } - ctx.Data["FileContent"] = string(buf) - } else { - ctx.Data["FileContent"] = content - } - } else { - treeNames = append(treeNames, "") // Append empty string to allow user name the new file. - } - - ctx.Data["TreeName"] = treeName - ctx.Data["TreeNames"] = treeNames - ctx.Data["BranchLink"] = branchLink - ctx.Data["commit_summary"] = "" - ctx.Data["commit_message"] = "" - ctx.Data["commit_choice"] = "direct" - ctx.Data["new_branch_name"] = "" - ctx.Data["last_commit"] = ctx.Repo.Commit.ID - ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") - ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") - ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") - - ctx.HTML(200, EDIT) -} - -func EditFile(ctx *context.Context) { - editFile(ctx, false) -} - -func NewFile(ctx *context.Context) { - editFile(ctx, true) -} - -func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bool) { - ctx.Data["PageIsEdit"] = true - ctx.Data["IsNewFile"] = isNewFile - ctx.Data["RequireHighlightJS"] = true - ctx.Data["RequireSimpleMDE"] = true - - oldBranchName := ctx.Repo.BranchName - branchName := oldBranchName - branchLink := ctx.Repo.RepoLink + "/src/" + branchName - oldTreeName := ctx.Repo.TreeName - content := form.Content - commitChoice := form.CommitChoice - lastCommit := form.LastCommit - - if commitChoice == "commit-to-new-branch" { - branchName = form.NewBranchName - } - - treeName := form.TreeName - treeName = strings.Trim(treeName, " ") - treeName = strings.Trim(treeName, "/") - - var treeNames []string - if len(treeName) > 0 { - treeNames = strings.Split(treeName, "/") - } - - ctx.Data["TreeName"] = treeName - ctx.Data["TreeNames"] = treeNames - ctx.Data["BranchLink"] = branchLink - ctx.Data["FileContent"] = content - ctx.Data["commit_summary"] = form.CommitSummary - ctx.Data["commit_message"] = form.CommitMessage - ctx.Data["commit_choice"] = commitChoice - ctx.Data["new_branch_name"] = branchName - ctx.Data["last_commit"] = ctx.Repo.Commit.ID - ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") - ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") - ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") - - if ctx.HasError() { - ctx.HTML(200, EDIT) - return - } - - if len(treeName) == 0 { - ctx.Data["Err_Filename"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.filename_cannot_be_empty"), EDIT, &form) - return - } - - if oldBranchName != branchName { - if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil { - ctx.Data["Err_Branchname"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), EDIT, &form) - return - } - } - - var treepath string - for index, part := range treeNames { - treepath = path.Join(treepath, part) - entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treepath) - if err != nil { - if git.IsErrNotExist(err) { - // Means there is no item with that name, so we're good - break - } - - ctx.Handle(500, "GetTreeEntryByPath", err) - return - } - if index != len(treeNames)-1 { - if !entry.IsDir() { - ctx.Data["Err_Filename"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), EDIT, &form) - return - } - } else { - if entry.IsDir() { - ctx.Data["Err_Filename"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.filename_is_a_directory", part), EDIT, &form) - return - } - } - } - - if !isNewFile { - _, err := ctx.Repo.Commit.GetTreeEntryByPath(oldTreeName) - if err != nil { - if git.IsErrNotExist(err) { - ctx.Data["Err_Filename"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.file_editing_no_longer_exists", oldTreeName), EDIT, &form) - } else { - ctx.Handle(500, "GetTreeEntryByPath", err) - } - return - } - if lastCommit != ctx.Repo.CommitID { - files, err := ctx.Repo.Commit.GetFilesChangedSinceCommit(lastCommit) - if err != nil { - ctx.Handle(500, "GetFilesChangedSinceCommit", err) - return - } - - for _, file := range files { - if file == treeName { - ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_editing", ctx.Repo.RepoLink+"/compare/"+lastCommit+"..."+ctx.Repo.CommitID), EDIT, &form) - return - } - } - } - } - - if oldTreeName != treeName { - // We have a new filename (rename or completely new file) so we need to make sure it doesn't already exist, can't clobber. - entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) - if err != nil { - if !git.IsErrNotExist(err) { - ctx.Handle(500, "GetTreeEntryByPath", err) - return - } - } - if entry != nil { - ctx.Data["Err_Filename"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.file_already_exists", treeName), EDIT, &form) - return - } - } - - var message string - if len(form.CommitSummary) > 0 { - message = strings.TrimSpace(form.CommitSummary) - } else { - if isNewFile { - message = ctx.Tr("repo.editor.add", treeName) - } else { - message = ctx.Tr("repo.editor.update", treeName) - } - } - - form.CommitMessage = strings.TrimSpace(form.CommitMessage) - if len(form.CommitMessage) > 0 { - message += "\n\n" + form.CommitMessage - } - - if err := ctx.Repo.Repository.UpdateRepoFile(ctx.User, &models.UpdateRepoFileOptions{ - LastCommitID: lastCommit, - OldBranch: oldBranchName, - NewBranch: branchName, - OldTreeName: oldTreeName, - NewTreeName: treeName, - Message: message, - Content: content, - IsNewFile: isNewFile, - }); err != nil { - ctx.Data["Err_Filename"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.failed_to_update_file", err), EDIT, &form) - return - } - - ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName) -} - -func EditFilePost(ctx *context.Context, form auth.EditRepoFileForm) { - editFilePost(ctx, form, false) -} - -func NewFilePost(ctx *context.Context, form auth.EditRepoFileForm) { - editFilePost(ctx, form, true) -} - -func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) { - treeName := ctx.Repo.TreeName - content := form.Content - - entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) - if err != nil { - if git.IsErrNotExist(err) { - ctx.Data["FileContent"] = content - ctx.HTML(200, DIFF_PREVIEW_NEW) - } else { - ctx.Error(500, "GetTreeEntryByPath: "+err.Error()) - } - return - } - if entry.IsDir() { - ctx.Error(422) - return - } - - diff, err := ctx.Repo.Repository.GetDiffPreview(ctx.Repo.BranchName, treeName, content) - if err != nil { - ctx.Error(500, "GetDiffPreview: "+err.Error()) - return - } - - if diff.NumFiles() == 0 { - ctx.PlainText(200, []byte(ctx.Tr("repo.editor.no_changes_to_show"))) - return - } - ctx.Data["File"] = diff.Files[0] - - ctx.HTML(200, DIFF_PREVIEW) -} diff --git a/routers/repo/editor.go b/routers/repo/editor.go new file mode 100644 index 0000000000..71fb040f9a --- /dev/null +++ b/routers/repo/editor.go @@ -0,0 +1,340 @@ +// Copyright 2016 The Gogs 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 repo + +import ( + "io/ioutil" + "path" + "strings" + + "github.com/gogits/git-module" + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/auth" + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/setting" + "github.com/gogits/gogs/modules/template" +) + +const ( + EDIT base.TplName = "repo/editor/edit" + DIFF_PREVIEW base.TplName = "repo/editor/diff_preview" + DIFF_PREVIEW_NEW base.TplName = "repo/editor/diff_preview_new" +) + +func editFile(ctx *context.Context, isNewFile bool) { + ctx.Data["PageIsEdit"] = true + ctx.Data["IsNewFile"] = isNewFile + ctx.Data["RequireHighlightJS"] = true + ctx.Data["RequireSimpleMDE"] = true + + branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchName + treeName := ctx.Repo.TreeName + + var treeNames []string + if len(treeName) > 0 { + treeNames = strings.Split(treeName, "/") + } + + if !isNewFile { + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) + if err != nil { + if git.IsErrNotExist(err) { + ctx.Handle(404, "GetTreeEntryByPath", err) + } else { + ctx.Handle(500, "GetTreeEntryByPath", err) + } + return + } + + // No way to edit a directory online. + if entry.IsDir() { + ctx.Handle(404, "", nil) + return + } + + blob := entry.Blob() + dataRc, err := blob.Data() + if err != nil { + ctx.Handle(404, "blob.Data", err) + return + } + + ctx.Data["FileSize"] = blob.Size() + ctx.Data["FileName"] = blob.Name() + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + // Only text file are editable online. + _, isTextFile := base.IsTextFile(buf) + if !isTextFile { + ctx.Handle(404, "", nil) + return + } + + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + if err, content := template.ToUTF8WithErr(buf); err != nil { + if err != nil { + log.Error(4, "Convert content encoding: %s", err) + } + ctx.Data["FileContent"] = string(buf) + } else { + ctx.Data["FileContent"] = content + } + } else { + treeNames = append(treeNames, "") // Append empty string to allow user name the new file. + } + + ctx.Data["TreeName"] = treeName + ctx.Data["TreeNames"] = treeNames + ctx.Data["BranchLink"] = branchLink + ctx.Data["commit_summary"] = "" + ctx.Data["commit_message"] = "" + ctx.Data["commit_choice"] = "direct" + ctx.Data["new_branch_name"] = "" + ctx.Data["last_commit"] = ctx.Repo.Commit.ID + ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") + ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") + ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") + + ctx.HTML(200, EDIT) +} + +func EditFile(ctx *context.Context) { + editFile(ctx, false) +} + +func NewFile(ctx *context.Context) { + editFile(ctx, true) +} + +func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bool) { + ctx.Data["PageIsEdit"] = true + ctx.Data["IsNewFile"] = isNewFile + ctx.Data["RequireHighlightJS"] = true + ctx.Data["RequireSimpleMDE"] = true + + oldBranchName := ctx.Repo.BranchName + branchName := oldBranchName + branchLink := ctx.Repo.RepoLink + "/src/" + branchName + oldTreeName := ctx.Repo.TreeName + content := form.Content + commitChoice := form.CommitChoice + lastCommit := form.LastCommit + + if commitChoice == "commit-to-new-branch" { + branchName = form.NewBranchName + } + + treeName := form.TreeName + treeName = strings.Trim(treeName, " ") + treeName = strings.Trim(treeName, "/") + + var treeNames []string + if len(treeName) > 0 { + treeNames = strings.Split(treeName, "/") + } + + ctx.Data["TreeName"] = treeName + ctx.Data["TreeNames"] = treeNames + ctx.Data["BranchLink"] = branchLink + ctx.Data["FileContent"] = content + ctx.Data["commit_summary"] = form.CommitSummary + ctx.Data["commit_message"] = form.CommitMessage + ctx.Data["commit_choice"] = commitChoice + ctx.Data["new_branch_name"] = branchName + ctx.Data["last_commit"] = ctx.Repo.Commit.ID + ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") + ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") + ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") + + if ctx.HasError() { + ctx.HTML(200, EDIT) + return + } + + if len(treeName) == 0 { + ctx.Data["Err_Filename"] = true + ctx.RenderWithErr(ctx.Tr("repo.editor.filename_cannot_be_empty"), EDIT, &form) + return + } + + if oldBranchName != branchName { + if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil { + ctx.Data["Err_Branchname"] = true + ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), EDIT, &form) + return + } + } + + var treepath string + for index, part := range treeNames { + treepath = path.Join(treepath, part) + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treepath) + if err != nil { + if git.IsErrNotExist(err) { + // Means there is no item with that name, so we're good + break + } + + ctx.Handle(500, "GetTreeEntryByPath", err) + return + } + if index != len(treeNames)-1 { + if !entry.IsDir() { + ctx.Data["Err_Filename"] = true + ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), EDIT, &form) + return + } + } else { + if entry.IsDir() { + ctx.Data["Err_Filename"] = true + ctx.RenderWithErr(ctx.Tr("repo.editor.filename_is_a_directory", part), EDIT, &form) + return + } + } + } + + if !isNewFile { + _, err := ctx.Repo.Commit.GetTreeEntryByPath(oldTreeName) + if err != nil { + if git.IsErrNotExist(err) { + ctx.Data["Err_Filename"] = true + ctx.RenderWithErr(ctx.Tr("repo.editor.file_editing_no_longer_exists", oldTreeName), EDIT, &form) + } else { + ctx.Handle(500, "GetTreeEntryByPath", err) + } + return + } + if lastCommit != ctx.Repo.CommitID { + files, err := ctx.Repo.Commit.GetFilesChangedSinceCommit(lastCommit) + if err != nil { + ctx.Handle(500, "GetFilesChangedSinceCommit", err) + return + } + + for _, file := range files { + if file == treeName { + ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_editing", ctx.Repo.RepoLink+"/compare/"+lastCommit+"..."+ctx.Repo.CommitID), EDIT, &form) + return + } + } + } + } + + if oldTreeName != treeName { + // We have a new filename (rename or completely new file) so we need to make sure it doesn't already exist, can't clobber. + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) + if err != nil { + if !git.IsErrNotExist(err) { + ctx.Handle(500, "GetTreeEntryByPath", err) + return + } + } + if entry != nil { + ctx.Data["Err_Filename"] = true + ctx.RenderWithErr(ctx.Tr("repo.editor.file_already_exists", treeName), EDIT, &form) + return + } + } + + var message string + if len(form.CommitSummary) > 0 { + message = strings.TrimSpace(form.CommitSummary) + } else { + if isNewFile { + message = ctx.Tr("repo.editor.add", treeName) + } else { + message = ctx.Tr("repo.editor.update", treeName) + } + } + + form.CommitMessage = strings.TrimSpace(form.CommitMessage) + if len(form.CommitMessage) > 0 { + message += "\n\n" + form.CommitMessage + } + + if err := ctx.Repo.Repository.UpdateRepoFile(ctx.User, &models.UpdateRepoFileOptions{ + LastCommitID: lastCommit, + OldBranch: oldBranchName, + NewBranch: branchName, + OldTreeName: oldTreeName, + NewTreeName: treeName, + Message: message, + Content: content, + IsNewFile: isNewFile, + }); err != nil { + ctx.Data["Err_Filename"] = true + ctx.RenderWithErr(ctx.Tr("repo.editor.failed_to_update_file", err), EDIT, &form) + return + } + + ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName) +} + +func EditFilePost(ctx *context.Context, form auth.EditRepoFileForm) { + editFilePost(ctx, form, false) +} + +func NewFilePost(ctx *context.Context, form auth.EditRepoFileForm) { + editFilePost(ctx, form, true) +} + +func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) { + treeName := ctx.Repo.TreeName + content := form.Content + + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName) + if err != nil { + if git.IsErrNotExist(err) { + ctx.Data["FileContent"] = content + ctx.HTML(200, DIFF_PREVIEW_NEW) + } else { + ctx.Error(500, "GetTreeEntryByPath: "+err.Error()) + } + return + } + if entry.IsDir() { + ctx.Error(422) + return + } + + diff, err := ctx.Repo.Repository.GetDiffPreview(ctx.Repo.BranchName, treeName, content) + if err != nil { + ctx.Error(500, "GetDiffPreview: "+err.Error()) + return + } + + if diff.NumFiles() == 0 { + ctx.PlainText(200, []byte(ctx.Tr("repo.editor.no_changes_to_show"))) + return + } + ctx.Data["File"] = diff.Files[0] + + ctx.HTML(200, DIFF_PREVIEW) +} + +func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) { + branchName := ctx.Repo.BranchName + treeName := ctx.Repo.TreeName + + if ctx.HasError() { + ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName) + return + } + + if err := ctx.Repo.Repository.DeleteRepoFile(ctx.User, ctx.Repo.CommitID, branchName, treeName, form.CommitSummary); err != nil { + ctx.Handle(500, "DeleteRepoFile", err) + return + } + + ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName) +} diff --git a/routers/repo/view.go b/routers/repo/view.go index 1572bb6150..7fe7984c58 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -53,7 +53,6 @@ func Home(ctx *context.Context) { rawLink := ctx.Repo.RepoLink + "/raw/" + branchName editLink := ctx.Repo.RepoLink + "/_edit/" + branchName newFileLink := ctx.Repo.RepoLink + "/_new/" + branchName - deleteLink := ctx.Repo.RepoLink + "/delete/" + branchName forkLink := setting.AppSubUrl + "/repo/fork/" + strconv.FormatInt(ctx.Repo.Repository.ID, 10) uploadFileLink := ctx.Repo.RepoLink + "/upload/" + branchName @@ -171,7 +170,6 @@ func Home(ctx *context.Context) { } if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch { - ctx.Data["FileDeleteLink"] = deleteLink + "/" + treename ctx.Data["FileDeleteLinkTooltip"] = ctx.Tr("repo.delete_this_file") } else { if !ctx.Repo.IsViewBranch { @@ -259,7 +257,7 @@ func Home(ctx *context.Context) { ctx.Data["LastCommitUser"] = models.ValidateCommitWithEmail(lastCommit) if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch { ctx.Data["NewFileLink"] = newFileLink + "/" + treename - if !setting.Repository.Upload.Enabled { + if setting.Repository.Upload.Enabled { ctx.Data["UploadFileLink"] = uploadFileLink + "/" + treename } } diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 5e3349eaab..f6e16ae7f7 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -30,7 +30,7 @@
{{.i18n.Tr "repo.edit_file"}} {{.i18n.Tr "repo.release.preview"}} - {{.i18n.Tr "repo.preview_changes"}} + {{.i18n.Tr "repo.preview_changes"}}