Link to executed workflow #31906
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,8 @@ import ( | |
| "io" | ||
| "sort" | ||
| "strings" | ||
|
|
||
| "code.gitea.io/gitea/modules/log" | ||
| ) | ||
|
|
||
| // Type returns the type of the entry (commit, tree, blob) | ||
|
|
@@ -179,3 +181,30 @@ func (tes Entries) Sort() { | |
| func (tes Entries) CustomSort(cmp func(s1, s2 string) bool) { | ||
| sort.Sort(customSortableEntries{cmp, tes}) | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Adding a note for other reviewers: this file doesn't differentiate between go-git and non-go-git impl, so it won't need multiple implementations based on which backend is used. There was a problem hiding this comment. Total side-tangent, but does anyone use go-git? There was a problem hiding this comment. go-git version has been used in almost all Windows users. |
||
| // GetPathInRepo returns the relative path in the tree to this entry | ||
| func (te *TreeEntry) GetPathInRepo() string { | ||
|
There was a problem hiding this comment. This file was organized by this: But now it becomes: The newly added code should be in the existing "TreeEntry code" section. |
||
| if te == nil { | ||
| return "" | ||
| } | ||
|
|
||
| path := te.Name() | ||
| current := te.ptree | ||
|
|
||
| for current != nil && current.ptree != nil { | ||
| entries, err := current.ptree.ListEntries() | ||
| if err != nil { | ||
| log.Error("Failed to climb git tree %v", err) | ||
| return "" | ||
| } | ||
| for _, entry := range entries { | ||
| if entry.ID.String() == current.ID.String() { | ||
| path = entry.Name() + "/" + path | ||
| break | ||
| } | ||
| } | ||
| current = current.ptree | ||
| } | ||
|
Comment on lines
+194
to
+207
There was a problem hiding this comment. This looks like a really inefficient way to gather the full path of a file. There was a problem hiding this comment. Agreed. I think a TreeEntry should have its absolute path. But, felt out of scope for this requested feature. There was a problem hiding this comment. I also agree with delvh, we can't do so. #31906 (comment) |
||
|
|
||
| return path | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Copyright 2024 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| //go:build gogit | ||
|
|
||
| package git | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/go-git/go-git/v5/plumbing/filemode" | ||
| "github.com/go-git/go-git/v5/plumbing/object" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func getTestEntries() Entries { | ||
| return Entries{ | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v1.0", Mode: filemode.Dir}}, | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.0", Mode: filemode.Dir}}, | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.1", Mode: filemode.Dir}}, | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.12", Mode: filemode.Dir}}, | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.2", Mode: filemode.Dir}}, | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v12.0", Mode: filemode.Dir}}, | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "abc", Mode: filemode.Regular}}, | ||
| &TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "bcd", Mode: filemode.Regular}}, | ||
| } | ||
| } | ||
|
|
||
| func TestEntriesSort(t *testing.T) { | ||
| entries := getTestEntries() | ||
| entries.Sort() | ||
| assert.Equal(t, "v1.0", entries[0].Name()) | ||
| assert.Equal(t, "v12.0", entries[1].Name()) | ||
| assert.Equal(t, "v2.0", entries[2].Name()) | ||
| assert.Equal(t, "v2.1", entries[3].Name()) | ||
| assert.Equal(t, "v2.12", entries[4].Name()) | ||
| assert.Equal(t, "v2.2", entries[5].Name()) | ||
| assert.Equal(t, "abc", entries[6].Name()) | ||
| assert.Equal(t, "bcd", entries[7].Name()) | ||
| } | ||
|
|
||
| func TestEntriesCustomSort(t *testing.T) { | ||
| entries := getTestEntries() | ||
| entries.CustomSort(func(s1, s2 string) bool { | ||
| return s1 > s2 | ||
| }) | ||
| assert.Equal(t, "v2.2", entries[0].Name()) | ||
| assert.Equal(t, "v2.12", entries[1].Name()) | ||
| assert.Equal(t, "v2.1", entries[2].Name()) | ||
| assert.Equal(t, "v2.0", entries[3].Name()) | ||
| assert.Equal(t, "v12.0", entries[4].Name()) | ||
| assert.Equal(t, "v1.0", entries[5].Name()) | ||
| assert.Equal(t, "bcd", entries[6].Name()) | ||
| assert.Equal(t, "abc", entries[7].Name()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
modulesis the wrong place for this.Go does not allow import cycles.
Please do not add any imports to
modelsfrommodules.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@delvh can you expand on what you are asking for?
It sounds like you are asking to move this function and the ListWorkflows function to models? In my humble opinion, I don't think this makes sense because there is no existing concept of a workflow in the database which to me is the equivalent of the
models. Happy to hear a different opinion.I could refactor a lot of the workflow logic, including ListWorkflows, to live in a new file called models/actions/workflows. But it feels odd since there is no database table for a workflow and would violate this principle:
Outlined here: https://docs.gitea.com/contributing/guidelines-backend
This
moduleis already dependent on theactions modelhere: https://github.com/go-gitea/gitea/blob/main/modules/actions/task_state.go#L7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤮 Okay, that is one of the places we didn't fix yet.
We are still working on removing all the historically grown errors.
For the time being, I think it is better not to introduce any already known technical debt.
As to where to add it, I would have added it as a type method on
actions_model.ActionRunwhich is defined inmodels/actions/run.go