Skip to content

Commit 044ddd1

Browse files
unknwonunknwon
committed
*: rename const to snack case
1 parent 300d5cc commit 044ddd1

File tree

15 files changed

+174
-97
lines changed

15 files changed

+174
-97
lines changed

‎commit_archive.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ import (
1313
type ArchiveType int
1414

1515
const (
16-
ZIP ArchiveType = iota + 1
17-
TARGZ
16+
ArchiveZip ArchiveType = iota + 1
17+
ArchiveTarGz
1818
)
1919

2020
func (c *Commit) CreateArchive(target string, archiveType ArchiveType) error {
2121
var format string
2222
switch archiveType {
23-
case ZIP:
23+
case ArchiveZip:
2424
format = "zip"
25-
case TARGZ:
25+
case ArchiveTarGz:
2626
format = "tar.gz"
2727
default:
2828
return fmt.Errorf("unknown format: %v", archiveType)

‎deprecated.go‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
// Copyright 2019 The Gogs Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
5+
package git
6+
7+
const (
8+
// DEPRECATED: use ArchiveZip instead
9+
ZIP = ArchiveZip
10+
// DEPRECATED: use ArchiveTarGz instead
11+
TARGZ = ArchiveTarGz
12+
)
13+
14+
// DEPRECATED: use BranchPrefix instead
15+
const BRANCH_PREFIX = BranchPrefix
16+
17+
// DEPRECATED: use RemotePrefix instead
18+
const REMOTE_PREFIX = RemotePrefix
19+
20+
const (
21+
// DEPRECATED: use DiffLinePlain instead
22+
DIFF_LINE_PLAIN = DiffLinePlain
23+
// DEPRECATED: use DiffLineAdd instead
24+
DIFF_LINE_ADD = DiffLineAdd
25+
// DEPRECATED: use DiffLineDel instead
26+
DIFF_LINE_DEL = DiffLineDel
27+
// DEPRECATED: use DiffLineSection instead
28+
DIFF_LINE_SECTION = DiffLineSection
29+
)
30+
31+
const (
32+
// DEPRECATED: use DiffFileAdd instead
33+
DIFF_FILE_ADD = DiffFileAdd
34+
// DEPRECATED: use DiffFileChange instead
35+
DIFF_FILE_CHANGE = DiffFileChange
36+
// DEPRECATED: use DiffFileDel instead
37+
DIFF_FILE_DEL = DiffFileDel
38+
// DEPRECATED: use DiffFileRename instead
39+
DIFF_FILE_RENAME = DiffFileRename
40+
)
41+
42+
const (
43+
// DEPRECATED: use RawDiffNormal instead
44+
RAW_DIFF_NORMAL = RawDiffNormal
45+
// DEPRECATED: use RawDiffPatch instead
46+
RAW_DIFF_PATCH = RawDiffPatch
47+
)
48+
49+
const (
50+
// DEPRECATED: use ObjectCommit instead
51+
OBJECT_COMMIT = ObjectCommit
52+
// DEPRECATED: use ObjectTree instead
53+
OBJECT_TREE = ObjectTree
54+
// DEPRECATED: use ObjectBlob instead
55+
OBJECT_BLOB = ObjectBlob
56+
// DEPRECATED: use ObjectTag instead
57+
OBJECT_TAG = ObjectTag
58+
)
59+
60+
// DEPRECATED: use TagPrefix instead
61+
const TAG_PREFIX = TagPrefix
62+
63+
// DEPRECATED: use EmptySHA instead
64+
const EMPTY_SHA = EmptySHA
65+
66+
const (
67+
// DEPRECATED: use EntryBlob instead
68+
ENTRY_MODE_BLOB = EntryBlob
69+
// DEPRECATED: use EntryExec instead
70+
ENTRY_MODE_EXEC = EntryExec
71+
// DEPRECATED: use EntrySymlink instead
72+
ENTRY_MODE_SYMLINK = EntrySymlink
73+
// DEPRECATED: use EntryCommit instead
74+
ENTRY_MODE_COMMIT = EntryCommit
75+
// DEPRECATED: use EntryTree instead
76+
ENTRY_MODE_TREE = EntryTree
77+
)

‎git.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111
)
1212

13-
const version = "0.8.0"
13+
const version = "0.8.1"
1414

1515
func Version() string {
1616
return version

‎repo.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type Repository struct {
2424
tagCache *objectCache
2525
}
2626

27-
const _PRETTY_LOG_FORMAT = `--pretty=format:%H`
27+
const prettyLogFormat = `--pretty=format:%H`
2828

2929
func (repo *Repository) parsePrettyFormatLogToList(logs []byte) (*list.List, error) {
3030
l := list.New()
@@ -240,14 +240,14 @@ type CountObject struct {
240240
}
241241

242242
const (
243-
_STAT_COUNT = "count: "
244-
_STAT_SIZE = "size: "
245-
_STAT_IN_PACK = "in-pack: "
246-
_STAT_PACKS = "packs: "
247-
_STAT_SIZE_PACK = "size-pack: "
248-
_STAT_PRUNE_PACKABLE = "prune-packable: "
249-
_STAT_GARBAGE = "garbage: "
250-
_STAT_SIZE_GARBAGE = "size-garbage: "
243+
statCount = "count: "
244+
statSize = "size: "
245+
statInPack = "in-pack: "
246+
statPacks = "packs: "
247+
statSizePack = "size-pack: "
248+
statPrunePackable = "prune-packable: "
249+
statGarbage = "garbage: "
250+
statSizeGarbage = "size-garbage: "
251251
)
252252

253253
func strToInt64(s string) int64 {
@@ -266,21 +266,21 @@ func GetRepoSize(repoPath string) (*CountObject, error) {
266266
countObject := new(CountObject)
267267
for _, line := range strings.Split(stdout, "\n") {
268268
switch {
269-
case strings.HasPrefix(line, _STAT_COUNT):
269+
case strings.HasPrefix(line, statCount):
270270
countObject.Count = strToInt64(line[7:])
271-
case strings.HasPrefix(line, _STAT_SIZE):
271+
case strings.HasPrefix(line, statSize):
272272
countObject.Size = strToInt64(line[6:]) * 1024
273-
case strings.HasPrefix(line, _STAT_IN_PACK):
273+
case strings.HasPrefix(line, statInPack):
274274
countObject.InPack = strToInt64(line[9:])
275-
case strings.HasPrefix(line, _STAT_PACKS):
275+
case strings.HasPrefix(line, statPacks):
276276
countObject.Packs = strToInt64(line[7:])
277-
case strings.HasPrefix(line, _STAT_SIZE_PACK):
277+
case strings.HasPrefix(line, statSizePack):
278278
countObject.SizePack = strToInt64(line[11:]) * 1024
279-
case strings.HasPrefix(line, _STAT_PRUNE_PACKABLE):
279+
case strings.HasPrefix(line, statPrunePackable):
280280
countObject.PrunePackable = strToInt64(line[16:])
281-
case strings.HasPrefix(line, _STAT_GARBAGE):
281+
case strings.HasPrefix(line, statGarbage):
282282
countObject.Garbage = strToInt64(line[9:])
283-
case strings.HasPrefix(line, _STAT_SIZE_GARBAGE):
283+
case strings.HasPrefix(line, statSizeGarbage):
284284
countObject.SizeGarbage = strToInt64(line[14:]) * 1024
285285
}
286286
}

‎repo_branch.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
goversion "github.com/mcuadros/go-version"
1212
)
1313

14-
const BRANCH_PREFIX = "refs/heads/"
14+
const BranchPrefix = "refs/heads/"
1515

1616
// IsReferenceExist returns true if given reference exists in the repository.
1717
func IsReferenceExist(repoPath, name string) bool {
@@ -21,7 +21,7 @@ func IsReferenceExist(repoPath, name string) bool {
2121

2222
// IsBranchExist returns true if given branch exists in the repository.
2323
func IsBranchExist(repoPath, name string) bool {
24-
return IsReferenceExist(repoPath, BRANCH_PREFIX+name)
24+
return IsReferenceExist(repoPath, BranchPrefix+name)
2525
}
2626

2727
func (repo *Repository) IsBranchExist(name string) bool {
@@ -42,12 +42,12 @@ func (repo *Repository) GetHEADBranch() (*Branch, error) {
4242
}
4343
stdout = strings.TrimSpace(stdout)
4444

45-
if !strings.HasPrefix(stdout, BRANCH_PREFIX) {
45+
if !strings.HasPrefix(stdout, BranchPrefix) {
4646
return nil, fmt.Errorf("invalid HEAD branch: %v", stdout)
4747
}
4848

4949
return &Branch{
50-
Name: stdout[len(BRANCH_PREFIX):],
50+
Name: stdout[len(BranchPrefix):],
5151
Path: stdout,
5252
}, nil
5353
}
@@ -58,7 +58,7 @@ func (repo *Repository) SetDefaultBranch(name string) error {
5858
return ErrUnsupportedVersion{"1.7.10"}
5959
}
6060

61-
_, err := NewCommand("symbolic-ref", "HEAD", BRANCH_PREFIX+name).RunInDir(repo.Path)
61+
_, err := NewCommand("symbolic-ref", "HEAD", BranchPrefix+name).RunInDir(repo.Path)
6262
return err
6363
}
6464

@@ -76,7 +76,7 @@ func (repo *Repository) GetBranches() ([]string, error) {
7676
if len(fields) != 2 {
7777
continue // NOTE: I should believe git will not give me wrong string.
7878
}
79-
branches[i] = strings.TrimPrefix(fields[1], BRANCH_PREFIX)
79+
branches[i] = strings.TrimPrefix(fields[1], BranchPrefix)
8080
}
8181
return branches, nil
8282
}

‎repo_commit.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
goversion "github.com/mcuadros/go-version"
1616
)
1717

18-
const REMOTE_PREFIX = "refs/remotes/"
18+
const RemotePrefix = "refs/remotes/"
1919

2020
// getRefCommitID returns the last commit ID string of given reference (branch or tag).
2121
func (repo *Repository) getRefCommitID(name string) (string, error) {
@@ -31,17 +31,17 @@ func (repo *Repository) getRefCommitID(name string) (string, error) {
3131

3232
// GetBranchCommitID returns last commit ID string of given branch.
3333
func (repo *Repository) GetBranchCommitID(name string) (string, error) {
34-
return repo.getRefCommitID(BRANCH_PREFIX + name)
34+
return repo.getRefCommitID(BranchPrefix + name)
3535
}
3636

3737
// GetTagCommitID returns last commit ID string of given tag.
3838
func (repo *Repository) GetTagCommitID(name string) (string, error) {
39-
return repo.getRefCommitID(TAG_PREFIX + name)
39+
return repo.getRefCommitID(TagPrefix + name)
4040
}
4141

4242
// GetRemoteBranchCommitID returns last commit ID string of given remote branch.
4343
func (repo *Repository) GetRemoteBranchCommitID(name string) (string, error) {
44-
return repo.getRefCommitID(REMOTE_PREFIX + name)
44+
return repo.getRefCommitID(RemotePrefix + name)
4545
}
4646

4747
// parseCommitData parses commit information from the (uncompressed) raw
@@ -172,7 +172,7 @@ func (repo *Repository) getCommitByPathWithID(id sha1, relpath string) (*Commit,
172172
relpath = `\` + relpath
173173
}
174174

175-
stdout, err := NewCommand("log", "-1", _PRETTY_LOG_FORMAT, id.String(), "--", relpath).RunInDir(repo.Path)
175+
stdout, err := NewCommand("log", "-1", prettyLogFormat, id.String(), "--", relpath).RunInDir(repo.Path)
176176
if err != nil {
177177
return nil, err
178178
}
@@ -187,7 +187,7 @@ func (repo *Repository) getCommitByPathWithID(id sha1, relpath string) (*Commit,
187187

188188
// GetCommitByPath returns the last commit of relative path.
189189
func (repo *Repository) GetCommitByPath(relpath string) (*Commit, error) {
190-
stdout, err := NewCommand("log", "-1", _PRETTY_LOG_FORMAT, "--", relpath).RunInDirBytes(repo.Path)
190+
stdout, err := NewCommand("log", "-1", prettyLogFormat, "--", relpath).RunInDirBytes(repo.Path)
191191
if err != nil {
192192
return nil, err
193193
}
@@ -201,7 +201,7 @@ func (repo *Repository) GetCommitByPath(relpath string) (*Commit, error) {
201201

202202
func (repo *Repository) CommitsByRangeSize(revision string, page, size int) (*list.List, error) {
203203
stdout, err := NewCommand("log", revision, "--skip="+strconv.Itoa((page-1)*size),
204-
"--max-count="+strconv.Itoa(size), _PRETTY_LOG_FORMAT).RunInDirBytes(repo.Path)
204+
"--max-count="+strconv.Itoa(size), prettyLogFormat).RunInDirBytes(repo.Path)
205205
if err != nil {
206206
return nil, err
207207
}
@@ -215,7 +215,7 @@ func (repo *Repository) CommitsByRange(revision string, page int) (*list.List, e
215215
}
216216

217217
func (repo *Repository) searchCommits(id sha1, keyword string) (*list.List, error) {
218-
stdout, err := NewCommand("log", id.String(), "-100", "-i", "--grep="+keyword, _PRETTY_LOG_FORMAT).RunInDirBytes(repo.Path)
218+
stdout, err := NewCommand("log", id.String(), "-100", "-i", "--grep="+keyword, prettyLogFormat).RunInDirBytes(repo.Path)
219219
if err != nil {
220220
return nil, err
221221
}
@@ -236,7 +236,7 @@ func (repo *Repository) FileCommitsCount(revision, file string) (int64, error) {
236236

237237
func (repo *Repository) CommitsByFileAndRangeSize(revision, file string, page, size int) (*list.List, error) {
238238
stdout, err := NewCommand("log", revision, "--skip="+strconv.Itoa((page-1)*size),
239-
"--max-count="+strconv.Itoa(size), _PRETTY_LOG_FORMAT, "--", file).RunInDirBytes(repo.Path)
239+
"--max-count="+strconv.Itoa(size), prettyLogFormat, "--", file).RunInDirBytes(repo.Path)
240240
if err != nil {
241241
return nil, err
242242
}
@@ -379,7 +379,7 @@ func (repo *Repository) getCommitsBeforeLimit(id sha1, num int) (*list.List, err
379379
// CommitsAfterDate returns a list of commits which committed after given date.
380380
// The format of date should be in RFC3339.
381381
func (repo *Repository) CommitsAfterDate(date string) (*list.List, error) {
382-
stdout, err := NewCommand("log", _PRETTY_LOG_FORMAT, "--since="+date).RunInDirBytes(repo.Path)
382+
stdout, err := NewCommand("log", prettyLogFormat, "--since="+date).RunInDirBytes(repo.Path)
383383
if err != nil {
384384
return nil, err
385385
}

0 commit comments

Comments
 (0)