Skip to content

Fix 500 when repo has invalid .editorconfig #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2016
Merged

Fix 500 when repo has invalid .editorconfig #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions routers/repo/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,10 @@ func Diff(ctx *context.Context) {
}
}

ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "ErrGettingEditorconfig", err)
setEditorconfigIfExists(ctx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here 🙂

if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec

ctx.Data["CommitID"] = commitID
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
Expand Down
23 changes: 23 additions & 0 deletions routers/repo/middlewares.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package repo

import (
"fmt"

"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/gogits/git-module"
)

func setEditorconfigIfExists(ctx *context.Context) {
ec, err := ctx.Repo.GetEditorconfig()

if err != nil && !git.IsErrNotExist(err) {
description := fmt.Sprintf("Error while getting .editorconfig file: %v", err)
if err := models.CreateRepositoryNotice(description); err != nil {
ctx.Handle(500, "ErrCreatingReporitoryNotice", err)
}
return
}

ctx.Data["Editorconfig"] = ec
}
12 changes: 4 additions & 8 deletions routers/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,10 @@ func ViewPullFiles(ctx *context.Context) {
return
}

ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "ErrGettingEditorconfig", err)
setEditorconfigIfExists(ctx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be in the router instead of in the route?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This as well?

if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec

headTarget := path.Join(pull.HeadUserName, pull.HeadRepo.Name)
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
Expand Down Expand Up @@ -627,12 +625,10 @@ func CompareAndPullRequest(ctx *context.Context) {
}
}

ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "ErrGettingEditorconfig", err)
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec

ctx.HTML(200, COMPARE_PULL)
}
Expand Down
6 changes: 2 additions & 4 deletions routers/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,10 @@ func Home(ctx *context.Context) {
return
}

ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "Repo.GetEditorconfig", err)
setEditorconfigIfExists(ctx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this

if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec

var treeNames []string
paths := make([]string, 0, 5)
Expand Down