coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More MixedCase consts

This commit is contained in:
Sandro Santilli 2016-11-07 17:24:59 +01:00
parent f388661bda
commit f6a11e0de1
6 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models/admin.go
View File

@ -22,7 +22,7 @@ import (
type NoticeType int type NoticeType int
const ( const (
NOTICE_REPOSITORY NoticeType = iota + 1 NoticeRepository NoticeType = iota + 1
) )
// Notice represents a system notice for admin. // Notice represents a system notice for admin.
@ -65,9 +65,9 @@ func CreateNotice(tp NoticeType, desc string) error {
return err return err
} }
// CreateRepositoryNotice creates new system notice with type NOTICE_REPOSITORY. // CreateRepositoryNotice creates new system notice with type NoticeRepository.
func CreateRepositoryNotice(desc string) error { func CreateRepositoryNotice(desc string) error {
return CreateNotice(NOTICE_REPOSITORY, desc) return CreateNotice(NoticeRepository, desc)
} }
// RemoveAllWithNotice removes all directories in given path and // RemoveAllWithNotice removes all directories in given path and

58
models/git_diff.go
View File

@ -31,18 +31,18 @@ import (
type DiffLineType uint8 type DiffLineType uint8
const ( const (
DIFF_LINE_PLAIN DiffLineType = iota + 1 DiffLinePlain DiffLineType = iota + 1
DIFF_LINE_ADD DiffLineAdd
DIFF_LINE_DEL DiffLineDel
DIFF_LINE_SECTION DIFF_LINE_SECTION
) )
type DiffFileType uint8 type DiffFileType uint8
const ( const (
DIFF_FILE_ADD DiffFileType = iota + 1 DiffFileAdd DiffFileType = iota + 1
DIFF_FILE_CHANGE DiffFileChange
DIFF_FILE_DEL DiffFileDel
DIFF_FILE_RENAME DIFF_FILE_RENAME
) )
@ -73,19 +73,19 @@ func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTM
// Reproduce signs which are cutted for inline diff before. // Reproduce signs which are cutted for inline diff before.
switch lineType { switch lineType {
case DIFF_LINE_ADD: case DiffLineAdd:
buf.WriteByte('+') buf.WriteByte('+')
case DIFF_LINE_DEL: case DiffLineDel:
buf.WriteByte('-') buf.WriteByte('-')
} }
for i := range diffs { for i := range diffs {
switch { switch {
case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD: case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DiffLineAdd:
buf.Write(addedCodePrefix) buf.Write(addedCodePrefix)
buf.WriteString(html.EscapeString(diffs[i].Text)) buf.WriteString(html.EscapeString(diffs[i].Text))
buf.Write(codeTagSuffix) buf.Write(codeTagSuffix)
case diffs[i].Type == diffmatchpatch.DiffDelete && lineType == DIFF_LINE_DEL: case diffs[i].Type == diffmatchpatch.DiffDelete && lineType == DiffLineDel:
buf.Write(removedCodePrefix) buf.Write(removedCodePrefix)
buf.WriteString(html.EscapeString(diffs[i].Text)) buf.WriteString(html.EscapeString(diffs[i].Text))
buf.Write(codeTagSuffix) buf.Write(codeTagSuffix)
@ -109,9 +109,9 @@ func (diffSection *DiffSection) GetLine(lineType DiffLineType, idx int) *DiffLin
LOOP: LOOP:
for _, diffLine := range diffSection.Lines { for _, diffLine := range diffSection.Lines {
switch diffLine.Type { switch diffLine.Type {
case DIFF_LINE_ADD: case DiffLineAdd:
addCount++ addCount++
case DIFF_LINE_DEL: case DiffLineDel:
delCount++ delCount++
default: default:
if matchDiffLine != nil { if matchDiffLine != nil {
@ -123,11 +123,11 @@ LOOP:
} }
switch lineType { switch lineType {
case DIFF_LINE_DEL: case DiffLineDel:
if diffLine.RightIdx == 0 && diffLine.LeftIdx == idx-difference { if diffLine.RightIdx == 0 && diffLine.LeftIdx == idx-difference {
matchDiffLine = diffLine matchDiffLine = diffLine
} }
case DIFF_LINE_ADD: case DiffLineAdd:
if diffLine.LeftIdx == 0 && diffLine.RightIdx == idx+difference { if diffLine.LeftIdx == 0 && diffLine.RightIdx == idx+difference {
matchDiffLine = diffLine matchDiffLine = diffLine
} }
@ -159,15 +159,15 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem
// try to find equivalent diff line. ignore, otherwise // try to find equivalent diff line. ignore, otherwise
switch diffLine.Type { switch diffLine.Type {
case DIFF_LINE_ADD: case DiffLineAdd:
compareDiffLine = diffSection.GetLine(DIFF_LINE_DEL, diffLine.RightIdx) compareDiffLine = diffSection.GetLine(DiffLineDel, diffLine.RightIdx)
if compareDiffLine == nil { if compareDiffLine == nil {
return template.HTML(html.EscapeString(diffLine.Content)) return template.HTML(html.EscapeString(diffLine.Content))
} }
diff1 = compareDiffLine.Content diff1 = compareDiffLine.Content
diff2 = diffLine.Content diff2 = diffLine.Content
case DIFF_LINE_DEL: case DiffLineDel:
compareDiffLine = diffSection.GetLine(DIFF_LINE_ADD, diffLine.LeftIdx) compareDiffLine = diffSection.GetLine(DiffLineAdd, diffLine.LeftIdx)
if compareDiffLine == nil { if compareDiffLine == nil {
return template.HTML(html.EscapeString(diffLine.Content)) return template.HTML(html.EscapeString(diffLine.Content))
} }
@ -264,7 +264,7 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
switch { switch {
case line[0] == ' ': case line[0] == ' ':
diffLine := &DiffLine{Type: DIFF_LINE_PLAIN, Content: line, LeftIdx: leftLine, RightIdx: rightLine} diffLine := &DiffLine{Type: DiffLinePlain, Content: line, LeftIdx: leftLine, RightIdx: rightLine}
leftLine++ leftLine++
rightLine++ rightLine++
curSection.Lines = append(curSection.Lines, diffLine) curSection.Lines = append(curSection.Lines, diffLine)
@ -289,14 +289,14 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
case line[0] == '+': case line[0] == '+':
curFile.Addition++ curFile.Addition++
diff.TotalAddition++ diff.TotalAddition++
diffLine := &DiffLine{Type: DIFF_LINE_ADD, Content: line, RightIdx: rightLine} diffLine := &DiffLine{Type: DiffLineAdd, Content: line, RightIdx: rightLine}
rightLine++ rightLine++
curSection.Lines = append(curSection.Lines, diffLine) curSection.Lines = append(curSection.Lines, diffLine)
continue continue
case line[0] == '-': case line[0] == '-':
curFile.Deletion++ curFile.Deletion++
diff.TotalDeletion++ diff.TotalDeletion++
diffLine := &DiffLine{Type: DIFF_LINE_DEL, Content: line, LeftIdx: leftLine} diffLine := &DiffLine{Type: DiffLineDel, Content: line, LeftIdx: leftLine}
if leftLine > 0 { if leftLine > 0 {
leftLine++ leftLine++
} }
@ -330,7 +330,7 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
curFile = &DiffFile{ curFile = &DiffFile{
Name: a, Name: a,
Index: len(diff.Files) + 1, Index: len(diff.Files) + 1,
Type: DIFF_FILE_CHANGE, Type: DiffFileChange,
Sections: make([]*DiffSection, 0, 10), Sections: make([]*DiffSection, 0, 10),
} }
diff.Files = append(diff.Files, curFile) diff.Files = append(diff.Files, curFile)
@ -354,13 +354,13 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
switch { switch {
case strings.HasPrefix(line, "new file"): case strings.HasPrefix(line, "new file"):
curFile.Type = DIFF_FILE_ADD curFile.Type = DiffFileAdd
curFile.IsCreated = true curFile.IsCreated = true
case strings.HasPrefix(line, "deleted"): case strings.HasPrefix(line, "deleted"):
curFile.Type = DIFF_FILE_DEL curFile.Type = DiffFileDel
curFile.IsDeleted = true curFile.IsDeleted = true
case strings.HasPrefix(line, "index"): case strings.HasPrefix(line, "index"):
curFile.Type = DIFF_FILE_CHANGE curFile.Type = DiffFileChange
case strings.HasPrefix(line, "similarity index 100%"): case strings.HasPrefix(line, "similarity index 100%"):
curFile.Type = DIFF_FILE_RENAME curFile.Type = DIFF_FILE_RENAME
curFile.IsRenamed = true curFile.IsRenamed = true
@ -459,8 +459,8 @@ func GetDiffRange(repoPath, beforeCommitID, afterCommitID string, maxLines, maxL
type RawDiffType string type RawDiffType string
const ( const (
RAW_DIFF_NORMAL RawDiffType = "diff" RawDiffNormal RawDiffType = "diff"
RAW_DIFF_PATCH RawDiffType = "patch" RawDiffPatch RawDiffType = "patch"
) )
// GetRawDiff dumps diff results of repository in given commit ID to io.Writer. // GetRawDiff dumps diff results of repository in given commit ID to io.Writer.
@ -478,14 +478,14 @@ func GetRawDiff(repoPath, commitID string, diffType RawDiffType, writer io.Write
var cmd *exec.Cmd var cmd *exec.Cmd
switch diffType { switch diffType {
case RAW_DIFF_NORMAL: case RawDiffNormal:
if commit.ParentCount() == 0 { if commit.ParentCount() == 0 {
cmd = exec.Command("git", "show", commitID) cmd = exec.Command("git", "show", commitID)
} else { } else {
c, _ := commit.Parent(0) c, _ := commit.Parent(0)
cmd = exec.Command("git", "diff", "-M", c.ID.String(), commitID) cmd = exec.Command("git", "diff", "-M", c.ID.String(), commitID)
} }
case RAW_DIFF_PATCH: case RawDiffPatch:
if commit.ParentCount() == 0 { if commit.ParentCount() == 0 {
cmd = exec.Command("git", "format-patch", "--no-signature", "--stdout", "--root", commitID) cmd = exec.Command("git", "format-patch", "--no-signature", "--stdout", "--root", commitID)
} else { } else {

4
models/git_diff_test.go
View File

@ -24,12 +24,12 @@ func TestDiffToHTML(t *testing.T) {
dmp.Diff{dmp.DiffInsert, "bar"}, dmp.Diff{dmp.DiffInsert, "bar"},
dmp.Diff{dmp.DiffDelete, " baz"}, dmp.Diff{dmp.DiffDelete, " baz"},
dmp.Diff{dmp.DiffEqual, " biz"}, dmp.Diff{dmp.DiffEqual, " biz"},
}, DIFF_LINE_ADD)) }, DiffLineAdd))
assertEqual(t, "-foo <span class=\"removed-code\">bar</span> biz", diffToHTML([]dmp.Diff{ assertEqual(t, "-foo <span class=\"removed-code\">bar</span> biz", diffToHTML([]dmp.Diff{
dmp.Diff{dmp.DiffEqual, "foo "}, dmp.Diff{dmp.DiffEqual, "foo "},
dmp.Diff{dmp.DiffDelete, "bar"}, dmp.Diff{dmp.DiffDelete, "bar"},
dmp.Diff{dmp.DiffInsert, " baz"}, dmp.Diff{dmp.DiffInsert, " baz"},
dmp.Diff{dmp.DiffEqual, " biz"}, dmp.Diff{dmp.DiffEqual, " biz"},
}, DIFF_LINE_DEL)) }, DiffLineDel))
} }

26
models/issue.go
View File

@ -1005,9 +1005,9 @@ func GetIssueUserPairsByMode(uid, rid int64, isClosed bool, page, filterMode int
} }
switch filterMode { switch filterMode {
case FM_ASSIGN: case FilterModeAssign:
sess.And("is_assigned=?", true) sess.And("is_assigned=?", true)
case FM_CREATE: case FilterModeCreate:
sess.And("is_poster=?", true) sess.And("is_poster=?", true)
default: default:
return ius, nil return ius, nil
@ -1070,10 +1070,10 @@ type IssueStats struct {
// Filter modes. // Filter modes.
const ( const (
FM_ALL = iota FilterModeAll = iota
FM_ASSIGN FilterModeAssign
FM_CREATE FilterModeCreate
FM_MENTION FilterModeMention
) )
func parseCountResult(results []map[string][]byte) int64 { func parseCountResult(results []map[string][]byte) int64 {
@ -1122,7 +1122,7 @@ func GetIssueStats(opts *IssueStatsOptions) *IssueStats {
} }
switch opts.FilterMode { switch opts.FilterMode {
case FM_ALL, FM_ASSIGN: case FilterModeAll, FilterModeAssign:
stats.OpenCount, _ = countSession(opts). stats.OpenCount, _ = countSession(opts).
And("is_closed = ?", false). And("is_closed = ?", false).
Count(&Issue{}) Count(&Issue{})
@ -1130,7 +1130,7 @@ func GetIssueStats(opts *IssueStatsOptions) *IssueStats {
stats.ClosedCount, _ = countSession(opts). stats.ClosedCount, _ = countSession(opts).
And("is_closed = ?", true). And("is_closed = ?", true).
Count(&Issue{}) Count(&Issue{})
case FM_CREATE: case FilterModeCreate:
stats.OpenCount, _ = countSession(opts). stats.OpenCount, _ = countSession(opts).
And("poster_id = ?", opts.UserID). And("poster_id = ?", opts.UserID).
And("is_closed = ?", false). And("is_closed = ?", false).
@ -1140,7 +1140,7 @@ func GetIssueStats(opts *IssueStatsOptions) *IssueStats {
And("poster_id = ?", opts.UserID). And("poster_id = ?", opts.UserID).
And("is_closed = ?", true). And("is_closed = ?", true).
Count(&Issue{}) Count(&Issue{})
case FM_MENTION: case FilterModeMention:
stats.OpenCount, _ = countSession(opts). stats.OpenCount, _ = countSession(opts).
Join("INNER", "issue_user", "issue.id = issue_user.issue_id"). Join("INNER", "issue_user", "issue.id = issue_user.issue_id").
And("issue_user.uid = ?", opts.UserID). And("issue_user.uid = ?", opts.UserID).
@ -1186,10 +1186,10 @@ func GetUserIssueStats(repoID, uid int64, repoIDs []int64, filterMode int, isPul
closedCountSession := countSession(true, isPull, repoID, repoIDs) closedCountSession := countSession(true, isPull, repoID, repoIDs)
switch filterMode { switch filterMode {
case FM_ASSIGN: case FilterModeAssign:
openCountSession.And("assignee_id = ?", uid) openCountSession.And("assignee_id = ?", uid)
closedCountSession.And("assignee_id = ?", uid) closedCountSession.And("assignee_id = ?", uid)
case FM_CREATE: case FilterModeCreate:
openCountSession.And("poster_id = ?", uid) openCountSession.And("poster_id = ?", uid)
closedCountSession.And("poster_id = ?", uid) closedCountSession.And("poster_id = ?", uid)
} }
@ -1214,10 +1214,10 @@ func GetRepoIssueStats(repoID, uid int64, filterMode int, isPull bool) (numOpen
closedCountSession := countSession(true, isPull, repoID) closedCountSession := countSession(true, isPull, repoID)
switch filterMode { switch filterMode {
case FM_ASSIGN: case FilterModeAssign:
openCountSession.And("assignee_id = ?", uid) openCountSession.And("assignee_id = ?", uid)
closedCountSession.And("assignee_id = ?", uid) closedCountSession.And("assignee_id = ?", uid)
case FM_CREATE: case FilterModeCreate:
openCountSession.And("poster_id = ?", uid) openCountSession.And("poster_id = ?", uid)
closedCountSession.And("poster_id = ?", uid) closedCountSession.And("poster_id = ?", uid)
} }

10
routers/repo/issue.go
View File

@ -126,16 +126,16 @@ func Issues(ctx *context.Context) {
assigneeID = ctx.QueryInt64("assignee") assigneeID = ctx.QueryInt64("assignee")
posterID int64 posterID int64
) )
filterMode := models.FM_ALL filterMode := models.FilterModeAll
switch viewType { switch viewType {
case "assigned": case "assigned":
filterMode = models.FM_ASSIGN filterMode = models.FilterModeAssign
assigneeID = ctx.User.ID assigneeID = ctx.User.ID
case "created_by": case "created_by":
filterMode = models.FM_CREATE filterMode = models.FilterModeCreate
posterID = ctx.User.ID posterID = ctx.User.ID
case "mentioned": case "mentioned":
filterMode = models.FM_MENTION filterMode = models.FilterModeMention
} }
var uid int64 = -1 var uid int64 = -1
@ -179,7 +179,7 @@ func Issues(ctx *context.Context) {
MilestoneID: milestoneID, MilestoneID: milestoneID,
Page: pager.Current(), Page: pager.Current(),
IsClosed: isShowClosed, IsClosed: isShowClosed,
IsMention: filterMode == models.FM_MENTION, IsMention: filterMode == models.FilterModeMention,
IsPull: isPullList, IsPull: isPullList,
Labels: selectLabels, Labels: selectLabels,
SortType: sortType, SortType: sortType,

8
routers/user/home.go
View File

@ -172,7 +172,7 @@ func Issues(ctx *context.Context) {
var ( var (
viewType string viewType string
sortType = ctx.Query("sort") sortType = ctx.Query("sort")
filterMode = models.FM_ALL filterMode = models.FilterModeAll
assigneeID int64 assigneeID int64
posterID int64 posterID int64
) )
@ -187,10 +187,10 @@ func Issues(ctx *context.Context) {
switch viewType { switch viewType {
case "assigned": case "assigned":
filterMode = models.FM_ASSIGN filterMode = models.FilterModeAssign
assigneeID = ctxUser.ID assigneeID = ctxUser.ID
case "created_by": case "created_by":
filterMode = models.FM_CREATE filterMode = models.FilterModeCreate
posterID = ctxUser.ID posterID = ctxUser.ID
} }
} }
@ -235,7 +235,7 @@ func Issues(ctx *context.Context) {
allCount += repo.NumOpenIssues allCount += repo.NumOpenIssues
} }
if filterMode != models.FM_ALL { if filterMode != models.FilterModeAll {
// Calculate repository issue count with filter mode. // Calculate repository issue count with filter mode.
numOpen, numClosed := repo.IssueStats(ctxUser.ID, filterMode, isPullList) numOpen, numClosed := repo.IssueStats(ctxUser.ID, filterMode, isPullList)
repo.NumOpenIssues, repo.NumClosedIssues = int(numOpen), int(numClosed) repo.NumOpenIssues, repo.NumClosedIssues = int(numOpen), int(numClosed)