-
-
Notifications
You must be signed in to change notification settings - Fork 5.9k
add submodule diff links #33097
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.
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
add submodule diff links #33097
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
b218c65
add submodule diff links
bohde 8d63859
fix ui
wxiaoguang a3d1f26
fix RefURL
wxiaoguang edc9623
refactor
wxiaoguang 4ada957
fix
wxiaoguang ae53bc7
fix translation
wxiaoguang a31e6c5
Merge branch 'main' into rb/submodule-diff
wxiaoguang 68a8488
refactor
wxiaoguang a4d34dd
fine tune edge cases
wxiaoguang b06374d
add more tests
wxiaoguang 1a12acd
fix test
wxiaoguang ee74ae0
use submodule icon in diff tree when rendering a submodule
bohde 8bf82ba
fix indentation
bohde f0ac963
Merge branch 'main' into rb/submodule-diff
GiteaBot 0e20133
fix vulnerability dependency to pass lint
wxiaoguang ff142d7
Merge branch 'main' into rb/submodule-diff
GiteaBot 00997a3
fix vulnerability dependency to pass lint
wxiaoguang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Copyright 2025 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package gitdiff | ||
|
||
import "code.gitea.io/gitea/modules/git" | ||
|
||
type SubmoduleInfo struct { | ||
SubmoduleURL string | ||
NewRefID string | ||
PreviousRefID string | ||
} | ||
|
||
func (si *SubmoduleInfo) PopulateURL(diffFile *DiffFile, leftCommit, rightCommit *git.Commit) error { | ||
// If the submodule is removed, we need to check it at the left commit | ||
if diffFile.IsDeleted { | ||
if leftCommit == nil { | ||
return nil | ||
} | ||
|
||
submodule, err := leftCommit.GetSubModule(diffFile.GetDiffFileName()) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
if submodule != nil { | ||
si.SubmoduleURL = submodule.URL | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// Even if the submodule path is updated, we check this at the right commit | ||
submodule, err := rightCommit.GetSubModule(diffFile.Name) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
if submodule != nil { | ||
si.SubmoduleURL = submodule.URL | ||
} | ||
return nil | ||
} | ||
|
||
func (si *SubmoduleInfo) RefID() string { | ||
if si.NewRefID != "" { | ||
return si.NewRefID | ||
} | ||
return si.PreviousRefID | ||
} | ||
|
||
// RefURL guesses and returns reference URL. | ||
func (si *SubmoduleInfo) RefURL(repoFullName string) string { | ||
return git.NewCommitSubModuleFile(si.SubmoduleURL, si.RefID()).RefURL(repoFullName) | ||
} | ||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
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,217 @@ | ||
// Copyright 2025 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package gitdiff | ||
|
||
import ( | ||
"strings" | ||
"testing" | ||
|
||
"code.gitea.io/gitea/models/db" | ||
"code.gitea.io/gitea/modules/setting" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestParseSubmoduleInfo(t *testing.T) { | ||
type testcase struct { | ||
name string | ||
gitdiff string | ||
infos map[int]SubmoduleInfo | ||
} | ||
|
||
tests := []testcase{ | ||
{ | ||
name: "added", | ||
gitdiff: `diff --git a/.gitmodules b/.gitmodules | ||
new file mode 100644 | ||
index 0000000..4ac13c1 | ||
--- /dev/null | ||
+++ b/.gitmodules | ||
@@ -0,0 +1,3 @@ | ||
+[submodule "gitea-mirror"] | ||
+ path = gitea-mirror | ||
+ url = https://gitea.com/gitea/gitea-mirror | ||
diff --git a/gitea-mirror b/gitea-mirror | ||
new file mode 160000 | ||
index 0000000..68972a9 | ||
--- /dev/null | ||
+++ b/gitea-mirror | ||
@@ -0,0 +1 @@ | ||
+Subproject commit 68972a994719ae5c74e28d8fa82fa27c23399bc8 | ||
`, | ||
infos: map[int]SubmoduleInfo{ | ||
1: {NewRefID: "68972a994719ae5c74e28d8fa82fa27c23399bc8"}, | ||
}, | ||
}, | ||
{ | ||
name: "updated", | ||
gitdiff: `diff --git a/gitea-mirror b/gitea-mirror | ||
index 68972a9..c8ffe77 160000 | ||
--- a/gitea-mirror | ||
+++ b/gitea-mirror | ||
@@ -1 +1 @@ | ||
-Subproject commit 68972a994719ae5c74e28d8fa82fa27c23399bc8 | ||
+Subproject commit c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d | ||
`, | ||
infos: map[int]SubmoduleInfo{ | ||
0: { | ||
PreviousRefID: "68972a994719ae5c74e28d8fa82fa27c23399bc8", | ||
NewRefID: "c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d", | ||
}, | ||
}, | ||
}, | ||
{ | ||
name: "rename", | ||
gitdiff: `diff --git a/.gitmodules b/.gitmodules | ||
index 4ac13c1..0510edd 100644 | ||
--- a/.gitmodules | ||
+++ b/.gitmodules | ||
@@ -1,3 +1,3 @@ | ||
[submodule "gitea-mirror"] | ||
- path = gitea-mirror | ||
+ path = gitea | ||
url = https://gitea.com/gitea/gitea-mirror | ||
diff --git a/gitea-mirror b/gitea | ||
similarity index 100% | ||
rename from gitea-mirror | ||
rename to gitea | ||
`, | ||
}, | ||
{ | ||
name: "deleted", | ||
gitdiff: `diff --git a/.gitmodules b/.gitmodules | ||
index 0510edd..e69de29 100644 | ||
--- a/.gitmodules | ||
+++ b/.gitmodules | ||
@@ -1,3 +0,0 @@ | ||
-[submodule "gitea-mirror"] | ||
- path = gitea | ||
- url = https://gitea.com/gitea/gitea-mirror | ||
diff --git a/gitea b/gitea | ||
deleted file mode 160000 | ||
index c8ffe77..0000000 | ||
--- a/gitea | ||
+++ /dev/null | ||
@@ -1 +0,0 @@ | ||
-Subproject commit c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d | ||
`, | ||
infos: map[int]SubmoduleInfo{ | ||
1: { | ||
PreviousRefID: "c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d", | ||
}, | ||
}, | ||
}, | ||
{ | ||
name: "moved and updated", | ||
gitdiff: `diff --git a/.gitmodules b/.gitmodules | ||
index 0510edd..bced3d8 100644 | ||
--- a/.gitmodules | ||
+++ b/.gitmodules | ||
@@ -1,3 +1,3 @@ | ||
[submodule "gitea-mirror"] | ||
- path = gitea | ||
+ path = gitea-1.22 | ||
url = https://gitea.com/gitea/gitea-mirror | ||
diff --git a/gitea b/gitea | ||
deleted file mode 160000 | ||
index c8ffe77..0000000 | ||
--- a/gitea | ||
+++ /dev/null | ||
@@ -1 +0,0 @@ | ||
-Subproject commit c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d | ||
diff --git a/gitea-1.22 b/gitea-1.22 | ||
new file mode 160000 | ||
index 0000000..8eefa1f | ||
--- /dev/null | ||
+++ b/gitea-1.22 | ||
@@ -0,0 +1 @@ | ||
+Subproject commit 8eefa1f6dedf2488db2c9e12c916e8e51f673160 | ||
`, | ||
infos: map[int]SubmoduleInfo{ | ||
1: { | ||
PreviousRefID: "c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d", | ||
}, | ||
2: { | ||
NewRefID: "8eefa1f6dedf2488db2c9e12c916e8e51f673160", | ||
}, | ||
}, | ||
}, | ||
{ | ||
name: "converted to file", | ||
gitdiff: `diff --git a/.gitmodules b/.gitmodules | ||
index 0510edd..e69de29 100644 | ||
--- a/.gitmodules | ||
+++ b/.gitmodules | ||
@@ -1,3 +0,0 @@ | ||
-[submodule "gitea-mirror"] | ||
- path = gitea | ||
- url = https://gitea.com/gitea/gitea-mirror | ||
diff --git a/gitea b/gitea | ||
deleted file mode 160000 | ||
index c8ffe77..0000000 | ||
--- a/gitea | ||
+++ /dev/null | ||
@@ -1 +0,0 @@ | ||
-Subproject commit c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d | ||
diff --git a/gitea b/gitea | ||
new file mode 100644 | ||
index 0000000..33a9488 | ||
--- /dev/null | ||
+++ b/gitea | ||
@@ -0,0 +1 @@ | ||
+example | ||
`, | ||
infos: map[int]SubmoduleInfo{ | ||
1: { | ||
PreviousRefID: "c8ffe777cf9c5bb47a38e3e0b3a3b5de6cd8813d", | ||
}, | ||
}, | ||
}, | ||
{ | ||
name: "converted to submodule", | ||
gitdiff: `diff --git a/.gitmodules b/.gitmodules | ||
index e69de29..14ee267 100644 | ||
--- a/.gitmodules | ||
+++ b/.gitmodules | ||
@@ -0,0 +1,3 @@ | ||
+[submodule "gitea"] | ||
+ path = gitea | ||
+ url = https://gitea.com/gitea/gitea-mirror | ||
diff --git a/gitea b/gitea | ||
deleted file mode 100644 | ||
index 33a9488..0000000 | ||
--- a/gitea | ||
+++ /dev/null | ||
@@ -1 +0,0 @@ | ||
-example | ||
diff --git a/gitea b/gitea | ||
new file mode 160000 | ||
index 0000000..68972a9 | ||
--- /dev/null | ||
+++ b/gitea | ||
@@ -0,0 +1 @@ | ||
+Subproject commit 68972a994719ae5c74e28d8fa82fa27c23399bc8 | ||
`, | ||
infos: map[int]SubmoduleInfo{ | ||
2: { | ||
NewRefID: "68972a994719ae5c74e28d8fa82fa27c23399bc8", | ||
}, | ||
}, | ||
}, | ||
} | ||
|
||
for _, testcase := range tests { | ||
testcase := testcase | ||
t.Run(testcase.name, func(t *testing.T) { | ||
diff, err := ParsePatch(db.DefaultContext, setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, strings.NewReader(testcase.gitdiff), "") | ||
assert.NoError(t, err) | ||
|
||
for i, expected := range testcase.infos { | ||
actual := diff.Files[i] | ||
assert.NotNil(t, actual) | ||
assert.Equal(t, expected, *actual.SubmoduleInfo) | ||
} | ||
}) | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.