diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-12-19 15:20:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-19 07:20:47 +0000 |
| commit | 4eb2a29910779ac6005a5d67f31067a1132c5297 (patch) | |
| tree | 6be901075430e94785bc37ac4ec67392a17ed868 /models | |
| parent | 128eac9e0b03ee9c1e45dbd49da8e4726ca569f2 (diff) | |
| download | gitea-4eb2a29910779ac6005a5d67f31067a1132c5297.tar.gz gitea-4eb2a29910779ac6005a5d67f31067a1132c5297.zip | |
Improve ObjectFormat interface (#28496)
The 4 functions are duplicated, especially as interface methods. I think
we just need to keep `MustID` the only one and remove other 3.
```
MustID(b []byte) ObjectID
MustIDFromString(s string) ObjectID
NewID(b []byte) (ObjectID, error)
NewIDFromString(s string) (ObjectID, error)
```
Introduced the new interfrace method `ComputeHash` which will replace
the interface `HasherInterface`. Now we don't need to keep two
interfaces.
Reintroduced `git.NewIDFromString` and `git.MustIDFromString`. The new
function will detect the hash length to decide which objectformat of it.
If it's 40, then it's SHA1. If it's 64, then it's SHA256. This will be
right if the commitID is a full one. So the parameter should be always a
full commit id.
@AdamMajer Please review.
Diffstat (limited to 'models')
| -rw-r--r-- | models/git/branch_test.go | 3 | ||||
| -rw-r--r-- | models/git/commit_status.go | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/models/git/branch_test.go b/models/git/branch_test.go index 8febc80f14..d480e2ec30 100644 --- a/models/git/branch_test.go +++ b/models/git/branch_test.go @@ -30,9 +30,8 @@ func TestAddDeletedBranch(t *testing.T) { secondBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo.ID, Name: "branch2"}) assert.True(t, secondBranch.IsDeleted) - objectFormat := git.ObjectFormatFromName(repo.ObjectFormatName) commit := &git.Commit{ - ID: objectFormat.MustIDFromString(secondBranch.CommitID), + ID: git.MustIDFromString(secondBranch.CommitID), CommitMessage: secondBranch.CommitMessage, Committer: &git.Signature{ When: secondBranch.CommitTime.AsLocalTime(), diff --git a/models/git/commit_status.go b/models/git/commit_status.go index a22fd23043..488e45de26 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -114,7 +114,7 @@ WHEN NOT MATCHED // GetNextCommitStatusIndex retried 3 times to generate a resource index func GetNextCommitStatusIndex(ctx context.Context, repoID int64, sha string) (int64, error) { - _, err := git.IDFromString(sha) + _, err := git.NewIDFromString(sha) if err != nil { return 0, git.ErrInvalidSHA{SHA: sha} } |